backend/server/rhnServer/server_hardware.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 952a131c6efe1753222e58ff9e00a5a37fe5e74d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 23 16:34:04 2011 +0100
IPv6: params is list of dictionaries, do the filtering level up
diff --git a/backend/server/rhnServer/server_hardware.py
b/backend/server/rhnServer/server_hardware.py
index 2fac31b..98bdd5f 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -611,6 +611,8 @@ class NetIfaceAddress(Device):
address = iface['address']
if not self.ifaces.has_key(iface['address']):
# To be deleted
+ # filter out params, which are not used in query
+ iface = dict((column, iface[column]) for column in self.unique)
deletes.append(iface)
continue
uploaded_iface = ifaces[address]
@@ -654,9 +656,7 @@ class NetIfaceAddress(Device):
columns = self.unique
wheres = map(lambda x: '%s = :%s' % (x, x), columns)
h = rhnSQL.prepare(q % (self.table, string.join(wheres, " and ")))
- # filter out params, which are not used in query
- bind_params = dict((c, params[c]) for c in columns)
- return _dml(h, bind_params)
+ return _dml(h, params)
def _update(self, params):
q = """update %s
Show replies by date