diff options
| author | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-18 14:38:41 +0000 |
|---|---|---|
| committer | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2010-11-18 14:38:41 +0000 |
| commit | 6a1befc6256aa46698cef01b89781200b4ea1e9c (patch) | |
| tree | 1c11dee8e14c4ecc0276cac2642af0b7b570f3e7 | |
| parent | d341940e3aabaaab618f98cd874ec39c5039c16e (diff) | |
| download | sos-6a1befc6256aa46698cef01b89781200b4ea1e9c.tar.gz | |
Various plugins: rhelVersion() is not a String
For all n integer, n != str(n)
We still have to assess the impact of this bugfix.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1007 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | sos/plugins/cluster.py | 6 | ||||
| -rw-r--r-- | sos/plugins/s390.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py index 16a88d76..78f9d42f 100644 --- a/sos/plugins/cluster.py +++ b/sos/plugins/cluster.py @@ -103,7 +103,7 @@ class cluster(sos.plugintools.PluginBase): if not self.isInstalled(pkg): self.addDiagnose("required package is missing: %s" % pkg) - if rhelver == "4": + if rhelver == 4: # (dlm, dlm-kernel) || gulm if not ((self.isInstalled("dlm") and self.isInstalled("dlm-kernel")) or self.isInstalled("gulm")): self.addDiagnose("required packages are missing: (dlm, dlm-kernel) || gulm") @@ -264,9 +264,9 @@ class cluster(sos.plugintools.PluginBase): rhelver = self.policy().rhelVersion() - if rhelver == "4": + if rhelver == 4: regex = r'^DLM Lock Space:\s*"([^"]*)".*$' - elif rhelver == "5Server" or rhelver == "5Client": + elif rhelver == 5: regex = r'^dlm\s+[^\s]+\s+([^\s]+)\s.*$' reg=re.compile(regex,re.MULTILINE) diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index 8706ba02..f1707d73 100644 --- a/sos/plugins/s390.py +++ b/sos/plugins/s390.py @@ -66,7 +66,7 @@ class s390(sos.plugintools.PluginBase): self.collectExtOutput("/sbin/fdasd -p %s" % (x,)) try: rhelver = self.policy().rhelVersion() - if rhelver == "5": + if rhelver == 5: self.collectExtOutput("/sbin/lsqeth") self.collectExtOutput("/sbin/lszfcp") except: |