From df02b541c97d944bf8262d68784459591fe70c22 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Thu, 3 Feb 2011 09:05:00 +0000 Subject: Correct handling of redhat-release for el6 --- sos/policyredhat.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sos/policyredhat.py b/sos/policyredhat.py index c6bdddfb..863445ae 100755 --- a/sos/policyredhat.py +++ b/sos/policyredhat.py @@ -153,12 +153,14 @@ class SosPolicy: def rhelVersion(self): try: - pkgname = self.pkgByName("redhat-release")["version"] + pkg = self.pkgByName("redhat-release") or \ + self.allPkgsByNameRegex("redhat-release-.*")[-1] + pkgname = pkg["version"] if pkgname[0] == "4": return 4 elif pkgname in [ "5Server", "5Client" ]: return 5 - elif pkgname == "6": + elif pkgname[0] == "6": return 6 except: pass return False -- cgit