diff options
| author | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-22 19:04:25 +0000 |
|---|---|---|
| committer | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-22 19:04:25 +0000 |
| commit | 869f23704aef414bf132c86f1fefdba48f3be537 (patch) | |
| tree | 59051067a021b9713dde5f31d6d2816d5c5c7152 | |
| parent | 6cdbb2666b58189180ca9d01696ba43d65933cef (diff) | |
| download | sos-869f23704aef414bf132c86f1fefdba48f3be537.tar.gz | |
Comments after \ broke in recent Python versions
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1020 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -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__ |