Attachment 291103 Details for Bug 428064 – info.py.patch

info.py.patch

info.py.patch (text/plain), 1.38 KB, created by Scott Scriven on 2008-01-08 23:36:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Scriven

Created: 2008-01-08 23:36:46 UTC

Size: 1.38 KB

patch

obsolete

>--- info.py.orig	2008-01-08 22:13:06.000000000 -0700
>+++ info.py	2008-01-08 22:40:16.000000000 -0700
>@@ -45,16 +45,10 @@
>         self.arch = uname.readline()[:-1]
>         uname.close()
>         
>-        uname = os.popen("uname -r")
>-        unameOutput = uname.readline()
>-        if not unameOutput:
>-            print "Error: uname failed"
>-        unameOutput.strip()
>-        
>         self.kernelRPMName = None
>         if self.osVersion == Constants.RHEL4:
>             pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<name>smp|hugemem|largesmp)?$")
>-            match = pattern.search(unameOutput)
>+            match = pattern.search(self.kernel)
>             if match:
>                 # if the release ends with ELsmp, ELhugemem, or ELlargesmp
>                 if match.group("name"):
>@@ -64,7 +58,7 @@
> 
>         else:   # RHEL5 and ?                                           
>             pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>el5)(?P<flavor>xen|PAE)?$")
>-            match = pattern.search(unameOutput)
>+            match = pattern.search(self.kernel)
>             if match:
>                 flavor = ""
>                 if match.group("flavor"):
>@@ -75,8 +69,6 @@
>             print "Error: could not determine kernel RPM name"
>             self.kernelRPMName = None
>         
>-        uname.close()
>-        
>    
>     def checkKernel(self):
>         # print kernel info

Actions: View

Attachments on bug 428064: 291103