client/rhel/rhn-client-tools/rhn-client-tools.spec | 2 +-
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 2 +-
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
client/tools/rhn-virtualization/virtualization/support.py | 8 +++++---
rel-eng/packages/rhn-virtualization | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 838e10ebce790bad0c1232ebdd78e24de2d8d951
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 12 16:11:57 2012 -0400
Automatic commit of package [rhn-virtualization] release [5.4.37-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec
b/client/tools/rhn-virtualization/rhn-virtualization.spec
index d1cc258..4a92102 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/%{name}-%{version}.tar.gz
-Version: 5.4.36
+Version: 5.4.37
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -147,6 +147,9 @@ fi
%doc LICENSE
%changelog
+* Thu Jul 12 2012 Stephen Herr <sherr(a)redhat.com> 5.4.37-1
+- 839776 - rhn-profile-sync exits with status 1 if libvirtd is not running
+
* Mon Jun 04 2012 Miroslav Suchý <msuchy(a)redhat.com> 5.4.36-1
- Add support for studio image deployments (client) (jrenner(a)suse.de)
- %%defattr is not needed since rpm 4.4 (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index 46514a6..458d577 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.36-1 client/tools/rhn-virtualization/
+5.4.37-1 client/tools/rhn-virtualization/
commit 75d403e1d5b463635e64336dc466b32b85d980cc
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 12 16:11:05 2012 -0400
839776 - rhn-profile-sync exits with status 1 if libvirtd is not running
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index e11133d..ed208c2 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -50,7 +50,7 @@ Conflicts: yum-rhn-plugin < 1.6.4-1
Conflicts: rhncfg < 5.9.23-1
Conflicts: spacewalk-koan < 0.2.7-1
Conflicts: rhn-kickstart < 5.4.3-1
-Conflicts: rhn-virtualization < 5.4.14-1
+Conflicts: rhn-virtualization < 5.4.36-2
BuildRequires: python-devel
BuildRequires: gettext
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
index 2259770..ad8ebbb 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
@@ -48,7 +48,7 @@ class ProfileCli(rhncli.RhnCli):
if support is not None:
print _("Updating virtualization profile...")
- support.refresh()
+ support.refresh(True)
if __name__ == "__main__":
diff --git a/client/tools/rhn-virtualization/virtualization/support.py
b/client/tools/rhn-virtualization/virtualization/support.py
index f6f72ab..b6748bf 100755
--- a/client/tools/rhn-virtualization/virtualization/support.py
+++ b/client/tools/rhn-virtualization/virtualization/support.py
@@ -54,12 +54,12 @@ vdsm_enabled = _check_status("vdsmd")
# Public Interface
###############################################################################
-def refresh():
+def refresh(fail_on_error=False):
"""
Refreshes the virtualization info for this host and any subdomains on the
server.
"""
- if _is_host_domain():
+ if _is_host_domain(fail_on_error):
domain_identity = IdentityType.HOST
my_uuid = _fetch_host_uuid()
else:
@@ -170,7 +170,7 @@ def schedulePoller(minute, hour, dom, month, dow):
# Helper Routines
###############################################################################
-def _is_host_domain():
+def _is_host_domain(fail_on_error=False):
"""
This function returns true if this system is currently a host domain.
Simply having virtualization enabled is sufficient.
@@ -188,6 +188,8 @@ def _is_host_domain():
conn = libvirt.openReadOnly(None)
except libvirt.libvirtError: # libvirtd is not running
sys.stderr.write(rhncli.utf8_encode(_("Warning: Could not retrieve
virtualization information!\n\tlibvirtd service needs to be running.\n")))
+ if fail_on_error:
+ exit(1)
return False
if conn and conn.getType() in ['Xen', 'QEMU']:
return True