Author: gnichols
Date: 2010-03-24 14:21:50 +0000 (Wed, 24 Mar 2010)
New Revision: 481
Modified:
trunk/v7/redhatrelease.py
Log:
573837 - 'v7 plan' causes python traceback on RHEL6
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2010-03-15 18:05:11 UTC (rev 480)
+++ trunk/v7/redhatrelease.py 2010-03-24 14:21:50 UTC (rev 481)
@@ -41,7 +41,7 @@
def _parse(self):
if self.text:
- pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[1-9\.]+)(?P<candidate>[a-zA-Z\ ]+)\((?P<name>[a-zA-Z0-9\ ]+)\)")
+ pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[0-9\.]+)(?P<candidate>[a-zA-Z\ ]+)\((?P<name>[a-zA-Z0-9\ ]+)\)")
match = pattern.match(self.text)
if not match:
self.valid = False
@@ -173,6 +173,10 @@
redHatRelease.text = "Red Hat Enterprise Linux Server release 5.5 Beta (Tikanga)"
redHatRelease._parse()
redHatRelease.dump()
+ redHatRelease = RedHatRelease()
+ redHatRelease.text = "Red Hat Enterprise Linux release 6.0 Beta (Santiago)"
+ redHatRelease._parse()
+ redHatRelease.dump()
print "\nTest uname parsing:"
redHatRelease = RedHatRelease()