diff options
| -rw-r--r-- | sos/plugins/rhn.py | 8 | ||||
| -rwxr-xr-x | sos/sosreport.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index 4412e33c..c317045e 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -27,11 +27,11 @@ 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("rhn-proxy-management") # pre-5.3 + or self.isInstalled("spacewalk-proxy-management") \ + or self.isInstalled("rhn-proxy-management") self.proxy = self.isInstalled("rhns-proxy-tools") \ - or self.isInstalled("spacewalk-java") \ # 5.3+ - or self.isInstalled("rhn-base") # pre-5.3 + or self.isInstalled("spacewalk-java") \ + or self.isInstalled("rhn-base") return self.satellite or self.proxy diff --git a/sos/sosreport.py b/sos/sosreport.py index 2b39ed90..be29f4d7 100755 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -42,8 +42,8 @@ from sos.helpers import importPlugin import signal from stat import ST_UID, ST_GID, ST_MODE, ST_CTIME, ST_ATIME, ST_MTIME, S_IMODE from time import strftime, localtime -from itertools import * from collections import deque +from itertools import izip from sos import _sos as _ from sos import __version__ |