diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2012-03-06 09:30:00 +0000 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2012-03-19 17:46:22 +0000 |
| commit | c1150f0eff0df9353d063f023fd4dac0e8b1a4bf (patch) | |
| tree | d4f569c158a6f60209be0db072ab9b44f1a01237 | |
| parent | 7f76fa31168a2e7aff80c1d25cc3a420ef409b59 (diff) | |
| download | sos-c1150f0eff0df9353d063f023fd4dac0e8b1a4bf.tar.gz | |
Fix satellite and proxy package detection in rhn plugin
Resolves: bz749262
| -rw-r--r-- | sos/plugins/rhn.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index efad65bd..cd8394b5 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -28,8 +28,13 @@ 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-java") \ + or self.isInstalled("rhn-base") + + self.proxy = self.isInstalled("rhns-proxy-tools") \ + or self.isInstalled("spacewalk-proxy-management") \ + or self.isInstalled("rhn-proxy-management") if self.satellite or self.proxy: return True @@ -72,15 +77,15 @@ class rhn(sos.plugintools.PluginBase): self.addCopySpec("/etc/tomcat5") self.addCopySpec("/var/log/tomcat5") - self.addCopySpec("/etc/tomcat5") - self.addCopySpec("/var/log/tomcat5") + self.addCopySpec("/etc/tomcat5/") + self.addCopySpec("/var/log/tomcat5/") if self.proxy: # copying configuration information - self.addCopySpec("/etc/squid") + self.addCopySpec("/etc/squid/") # copying logs - self.addCopySpec("/var/log/squid") + self.addCopySpec("/var/log/squid/") return |