client/tools/rhn-virtualization/virtualization/poller.py | 4 ++-- client/tools/rhn-virtualization/virtualization/support.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit d7718a510656712a4c48c438ff151ea6e20f07d3 Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu May 28 16:18:22 2009 -0400
502902 - If xend is not running instead of returning an empty list return an empty dict and let the registration and profile sync warn instead of failing
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py b/client/tools/rhn-virtualization/virtualization/poller.py index 08ed39f..e8d10c6 100644 --- a/client/tools/rhn-virtualization/virtualization/poller.py +++ b/client/tools/rhn-virtualization/virtualization/poller.py @@ -65,7 +65,7 @@ def poll_hypervisor(): 'state' : '...' }, ... } """ if not libvirt: - return [] + return {}
try: conn = libvirt.open(None) @@ -75,7 +75,7 @@ def poll_hypervisor():
if not conn: # No connection to hypervisor made - return [] + return {}
domainIDs = conn.listDomainsID()
diff --git a/client/tools/rhn-virtualization/virtualization/support.py b/client/tools/rhn-virtualization/virtualization/support.py index abd3a01..d449bee 100755 --- a/client/tools/rhn-virtualization/virtualization/support.py +++ b/client/tools/rhn-virtualization/virtualization/support.py @@ -68,6 +68,10 @@ def refresh():
# Now, crawl each of the domains on this host. domains = poller.poll_hypervisor() + if not len(domains): + # Either there were no domains or xend might not be running + # dont proceed further. + return domain_list = domains.values() domain_uuids = domains.keys()
spacewalk-commits@lists.fedorahosted.org