client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++- client/tools/rhn-virtualization/virtualization/domain_control.py | 2 +- client/tools/rhn-virtualization/virtualization/poller.py | 2 +- client/tools/rhncfg/config_common/local_config.py | 7 ++++--- rel-eng/packages/rhn-virtualization | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-)
New commits: commit df7fcf026b5e41ad17ff2080f4a5e613c61aad48 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Aug 12 08:50:57 2011 +0200
Automatic commit of package [rhn-virtualization] release [5.4.25-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec index fb6fbb8..5db2bc7 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t...
-Version: 5.4.24 +Version: 5.4.25 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE
%changelog +* Fri Aug 12 2011 Miroslav Suchý 5.4.25-1 +- fix syntax errors + * Thu Aug 11 2011 Miroslav Suchý 5.4.24-1 - do not mask original error by raise in execption
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization index 7c4d42c..9c52891 100644 --- a/rel-eng/packages/rhn-virtualization +++ b/rel-eng/packages/rhn-virtualization @@ -1 +1 @@ -5.4.24-1 client/tools/rhn-virtualization/ +5.4.25-1 client/tools/rhn-virtualization/
commit 7f2e37ae904faf4963bc948a03d9080ef3ae5893 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Aug 12 08:46:52 2011 +0200
fix syntax errors
diff --git a/client/tools/rhn-virtualization/virtualization/domain_control.py b/client/tools/rhn-virtualization/virtualization/domain_control.py index aa98238..535ec22 100755 --- a/client/tools/rhn-virtualization/virtualization/domain_control.py +++ b/client/tools/rhn-virtualization/virtualization/domain_control.py @@ -117,7 +117,7 @@ def _get_domain(uuid): domain = conn.lookupByUUIDString(hyphenized_uuid) except libvirt.libvirtError, lve: raise VirtualizationException, \ - "Domain UUID '%s' not found: %s", (hyphenized_uuid, str(lve)), None, sys.exc_info()[2] + "Domain UUID '%s' not found: %s" (hyphenized_uuid, str(lve)), sys.exc_info()[2] return (conn, domain)
def _call_domain_control_routine(uuid, routine_name, *args): diff --git a/client/tools/rhn-virtualization/virtualization/poller.py b/client/tools/rhn-virtualization/virtualization/poller.py index 5bde130..8b96f0d 100644 --- a/client/tools/rhn-virtualization/virtualization/poller.py +++ b/client/tools/rhn-virtualization/virtualization/poller.py @@ -92,7 +92,7 @@ def poll_hypervisor(): except libvirt.libvirtError, lve: raise VirtualizationException, \ "Failed to obtain handle to domain %d: %s" % \ - (domainID, repr(lve)), None, sys.exc_info()[2] + (domainID, repr(lve)), sys.exc_info()[2]
uuid = binascii.hexlify(domain.UUID()) # SEE: http://libvirt.org/html/libvirt-libvirt.html#virDomainInfo
commit 3d7a45f46f39f90b509699374da188a0ed977efa Author: Miroslav Suchý msuchy@redhat.com Date: Thu Aug 11 14:32:40 2011 +0200
None has not iteritems() method
>>> local_config.init("rhncfg") Traceback (most recent call last): File "<stdin>", line 1, in ? File "/usr/share/rhn/config_common/local_config.py", line 101, in init cp = rhncfgConfigParser._instance = rhncfgConfigParser(section, defaults) File "/usr/share/rhn/config_common/local_config.py", line 29, in __init__ for (k, v) in defaults.iteritems(): AttributeError: 'NoneType' object has no attribute 'iteritems'
diff --git a/client/tools/rhncfg/config_common/local_config.py b/client/tools/rhncfg/config_common/local_config.py index ebdacc9..5e9ed54 100644 --- a/client/tools/rhncfg/config_common/local_config.py +++ b/client/tools/rhncfg/config_common/local_config.py @@ -26,9 +26,10 @@ class rhncfgConfigParser(ConfigParser.ConfigParser):
def __init__(self, section, defaults=None): """defaults is either None, or a dictionary of default values which can be overridden""" - for (k, v) in defaults.iteritems(): - if type(v) == int: - defaults[k] = str(v) + if defaults: + for (k, v) in defaults.iteritems(): + if type(v) == int: + defaults[k] = str(v) ConfigParser.ConfigParser.__init__(self, defaults) self.section = section self.overrides = {}