Attachment 839068 Details for Bug 1031840 – patch removing download of kernelInfo.xml

[patch] patch removing download of kernelInfo.xml

0004-1031840-downloading-of-kernel-info-from-the-Partner-.patch (text/plain), 3.93 KB, created by Greg Nichols on 2013-12-19 16:38:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-12-19 16:38:26 UTC

Size: 3.93 KB

patch

obsolete

>From 8f4c2169cd8018625c864f561cc754885933d4e6 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Thu, 19 Dec 2013 11:36:44 -0500
>Subject: [PATCH 4/4] 1031840 - downloading of kernel info from the Partner's
> site should be removed.
>
>---
> tests/info/info.py | 50 +++++++++++---------------------------------------
> 1 file changed, 11 insertions(+), 39 deletions(-)
>
>diff --git a/tests/info/info.py b/tests/info/info.py
>index 623d7bc..5f00336 100644
>--- a/tests/info/info.py
>+++ b/tests/info/info.py
>@@ -145,7 +145,7 @@ class InfoTest(Test):
>                     modules.append(match.group("mod_name"))
>         procModules.close()
>         return modules
>-    
>+
>     def checkKernelIsGA(self):
>         release = self.redHatRelease
>         # if kernel is RT
>@@ -158,54 +158,28 @@ class InfoTest(Test):
>              else:
>                  print "Warning: the running kernel is a realtime kernel, but product release information could not be found" 
>                  return True
>-             
>+
>         return self.__checkKernelIsGA(release)
>-                    
>-    
>+
>+
>     def __checkKernelIsGA(self, release):
>-        
>+
>         if "Red Hat"not in release.getProduct() or (release.getProduct() == "Red Hat Enterprise Linux" and self.redHatRelease.getVersion() < 5): 
>             print "Warning: could not check kernel GA status for %s version %s" % (release.getProduct(), release.getVersion())
>             # return True
>-        
>+
>+        # read the kernel info file provided by the hwcert-client-info package
>         kernelInfo = None
>-        kernelInfoFile = "kernelInfo.xml"
>-        #try to download the kernel info file
>-        fileURL = self.environment.getPartnerServerURL() + kernelInfoFile
>-        response = None
>-        if self.debug is not Constants.off:
>-            print "Getting kernel information file %s " % fileURL    
>-            sys.stdout.flush()
>-        try:
>-            request = urllib2.Request(fileURL)
>-            opener = urllib2.build_opener()                        
>-            response = opener.open(request).read()
>-            if response:
>-                # save it locally
>-                file = open(kernelInfoFile, "w")
>-                file.write(response)
>-                file.close()
>-                if self.debug is not Constants.off:
>-                    print "saved kernel info to " + kernelInfoFile
>-            else:
>-                print "Warning: Could not download kernel info file - kernel information may be out-of-date."
>-        except Exception, e:
>-            response = None
>-            if self.debug != Constants.off:
>-                print "Warning: could not download kernel information file:"
>-                print e
>-                
>-        # if it couldn't be downloaded, use the one in /var/share/hwcert/lib
>+        kernelInfoFile = os.path.join(self.environment.getLibraryDirectory(), "kernelInfo.xml")
>         if not os.path.exists(kernelInfoFile):
>-            kernelInfoFile = os.path.join(self.environment.getLibraryDirectory(), kernelInfoFile)
>-        
>-            
>+            print "Error: could not find kernel info file %s" % kernelInfoFile
>+            return False
>+
>         try:
>             if self.debug is not Constants.off:
>                 print "reading kernel info file " + kernelInfoFile
>             kernelInfo = KernelInfo(kernelInfoFile)
>             RHELGAKernel = kernelInfo.getGAKernel(release.getProduct(), release.getVersion(), release.getUpdate())
>-            
>             if RHELGAKernel:
>                 if self.redHatRelease.getKernelVersionRelease() == RHELGAKernel:
>                     print "Kernel is %s %s.%s GA: %s" % (release.getProduct(), release.getVersion(), release.getUpdate(), RHELGAKernel)
>@@ -224,8 +198,6 @@ class InfoTest(Test):
>         except IOError:
>             print "Error: could not open kernel info file " + kernelInfoFile
>             return False
>-       
>-        
> 
>     def checkSELinux(self):
>         errors = list()
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1031840: 838876 | 839068