diff options
| author | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-22 15:49:30 +0000 |
|---|---|---|
| committer | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-22 15:49:30 +0000 |
| commit | db3f5a7dfd66bdcc33217500f2b6f38795dbd69c (patch) | |
| tree | fc7e34aee79dedb791eb68f7343e024f7c27194f | |
| parent | 612836c38fe671369c754e5af44c8b9d19420b7d (diff) | |
| download | sos-db3f5a7dfd66bdcc33217500f2b6f38795dbd69c.tar.gz | |
Pierre broke trunk, as usual
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1018 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | sos/plugins/ftp.py | 2 | ||||
| -rw-r--r-- | sos/plugins/ipa.py | 2 | ||||
| -rw-r--r-- | sos/plugins/rhn.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sos/plugins/ftp.py b/sos/plugins/ftp.py index 41aeb385..6afc9260 100644 --- a/sos/plugins/ftp.py +++ b/sos/plugins/ftp.py @@ -13,7 +13,7 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import sos.plugintools -from os.path import returns +from os.path import exists class ftp(sos.plugintools.PluginBase): """FTP server related information diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py index 2e13db20..cc35ad38 100644 --- a/sos/plugins/ipa.py +++ b/sos/plugins/ipa.py @@ -24,7 +24,7 @@ class ipa(sos.plugintools.PluginBase): # need to get kerberos and ipa specific addons. def checkenabled(self): - return self.isInstalled("ipa-server") or exists("/etc/ipa"): + return self.isInstalled("ipa-server") or exists("/etc/ipa") def setup(self): self.addCopySpec("/etc/dirsrv/ds.keytab") diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index 60e2479e..6be20a76 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -27,7 +27,7 @@ class rhn(sos.plugintools.PluginBase): def checkenabled(self): self.satellite = self.isInstalled("rhns-satellite-tools") \ - or self.isInstalled("spacewalk-proxy-management" \ # 5.3+ + 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+ |