diff options
| author | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-18 15:03:13 +0000 |
|---|---|---|
| committer | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-18 15:03:13 +0000 |
| commit | 0bab0369ab556c8e167122b74828298115ed7c7f (patch) | |
| tree | 79ae801fbe13a452f7226b3965ef76a35178f065 | |
| parent | 6a1befc6256aa46698cef01b89781200b4ea1e9c (diff) | |
| download | sos-0bab0369ab556c8e167122b74828298115ed7c7f.tar.gz | |
rhn.py: detection of recent versions
Closes BZ#590389.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1008 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | sos/plugins/rhn.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index efad65bd..300524be 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -28,8 +28,12 @@ class rhn(sos.plugintools.PluginBase): def checkenabled(self): # enable if any related package is installed - self.satellite = self.isInstalled("rhns-satellite-tools") - self.proxy = self.isInstalled("rhns-proxy-tools") + self.satellite = self.isInstalled("rhns-satellite-tools") \ + or self.isInstalled("spacewalk-proxy-management" \ # 5.3+ + or self.isInstalled("rhn-proxy-management") # pre-5.3 + self.proxy = self.isInstalled("rhns-proxy-tools") \ + or self.isInstalled("spacewalk-java") \ # 5.3+ + or self.isInstalled("rhn-base") # pre-5.3 if self.satellite or self.proxy: return True |