backend/satellite_tools/exporter/exportLib.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ef9d1216b811d9e1f7949fb39d55d2eda47a8bc0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Nov 7 10:42:43 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.4-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5ed677d..4659599 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.3
+Version: 1.9.4
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Nov 07 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.4-1
+- renaming forgotten 'dict' to 'row_dict'
+
* Tue Nov 06 2012 Jan Pazdziora 1.9.3-1
- The fcntl documentation recommends different pack format.
- Only SEEK_SET used, no need to have zero defined in an extra module.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2d8673b..8089f49 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.3-1 backend/
+1.9.4-1 backend/
commit 1918de0c188dd83c3a514dbc1bfd812cc43623b8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Nov 7 10:06:02 2012 +0100
renaming forgotten 'dict' to 'row_dict'
this fixes commit: ce110979858bdf6f9e9d0bc46bfcd4fd0de3cc07
addressing:
[Wed Nov 07 09:20:13 2012] [error] Traceback (most recent call last):
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_exporter/satexport.py",
line 108, in _wrapper
[Wed Nov 07 09:20:13 2012] [error] ret = function(req)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_exporter/satexport.py",
line 174, in _handler
[Wed Nov 07 09:20:13 2012] [error] result = f(*params)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/share/rhn/satellite_exporter/handlers/non_auth_dumper.py", line 332, in
kickstartable_trees
[Wed Nov 07 09:20:13 2012] [error] return
self.dump_kickstartable_trees(kickstart_labels=kickstart_labels)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/share/rhn/satellite_exporter/handlers/non_auth_dumper.py", line 274, in
dump_kickstartable_trees
[Wed Nov 07 09:20:13 2012] [error] validate_kickstarts=True)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/disk_dumper/dumper.py",
line 412, in dump_kickstartable_trees
[Wed Nov 07 09:20:13 2012] [error] self._write_dump(KickstartableTreesDumper,
params=kickstart_labels)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/disk_dumper/dumper.py",
line 145, in _write_dump
[Wed Nov 07 09:20:13 2012] [error] dumper.dump()
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/exporter/exportLib.py",
line 85, in dump
[Wed Nov 07 09:20:13 2012] [error] self.timer(6, "dump_subelement",
self.dump_subelement, data)
[Wed Nov 07 09:20:13 2012] [error] File "/usr/lib/python2.4/site-packages/spac
ewalk/satellite_tools/exporter/exportLib.py", line 51, in timer
[Wed Nov 07 09:20:13 2012] [error] result = function(*args, **kwargs)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/exporter/exportLib.py",
line 94, in dump_subelement
[Wed Nov 07 09:20:13 2012] [error] data.dump()
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/exporter/exportLib.py",
line 85, in dump
[Wed Nov 07 09:20:13 2012] [error] self.timer(6, "dump_subelement",
self.dump_subelement, data)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/exporter/exportLib.py",
line 51, in timer
[Wed Nov 07 09:20:13 2012] [error] result = function(*args, **kwargs)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/disk_dumper/dumper.py",
line 655, in dump_subelement
[Wed Nov 07 09:20:13 2012] [error] self.non_cached_class.dump_subelement(self,
row)
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/exporter/exportLib.py",
line 156, in dump_subelement
[Wed Nov 07 09:20:13 2012] [error] d.dump()
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/exporter/exportLib.py",
line 65, in dump
[Wed Nov 07 09:20:13 2012] [error] self._attributes = self.set_attributes() or {}
[Wed Nov 07 09:20:13 2012] [error] File
"/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/exporter/exportLib.py",
line 1358, in set_attributes
[Wed Nov 07 09:20:13 2012] [error] del dict['id']
[Wed Nov 07 09:20:13 2012] [error] TypeError: object does not support item deletion
diff --git a/backend/satellite_tools/exporter/exportLib.py
b/backend/satellite_tools/exporter/exportLib.py
index 629f2ed..8cc6f08 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -1355,7 +1355,7 @@ class _KickstartableTreeDumper(BaseRowDumper):
def set_attributes(self):
row_dict = self._row.copy()
- del dict['id']
+ del row_dict['id']
last_modified = row_dict['last-modified']
row_dict['last-modified'] = _dbtime2timestamp(last_modified)
return row_dict