Attachment 587413 Details for Bug 822690 – hardwaretest.py patch to check vendor, make and model before generating results rpm

[patch] hardwaretest.py patch to check vendor, make and model before generating results rpm

hardwaretest.patch (text/plain), 1.87 KB, created by Greg Nichols on 2012-05-29 13:43:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-05-29 13:43:53 UTC

Size: 1.87 KB

patch

obsolete

>Index: hardwaretest.py
>===================================================================
>--- hardwaretest.py	(revision 1320)
>+++ hardwaretest.py	(working copy)
>@@ -1014,6 +1014,12 @@
>                             self.removeLogFiles()
>                         return True
>                     
>+            # make sure model and vendor are set
>+            if not (self.certification.getHardware(Tags.vendor) and self.certification.getHardware(Tags.make) and self.certification.getHardware(Tags.model)):
>+                print "Error: could not generate results rpm because vendor, make or model are not set"
>+                print "Use \"v7 plan --certification to set these values"
>+                return False
>+            
>             if self.options.mode == Constants.auto or self.ui.promptConfirm("Would you like to package the results?"):
>                 report = Report(self.options, self.certification)
>                 if report.WriteResultsRPM(self.environment.getLogDirectory()):
>@@ -1127,10 +1133,24 @@
>         elif os.path.exists('/proc/device-tree/model'):
>             f=open('/proc/device-tree/model')
>             model = f.readline().strip()
>+            # if there's a comma, guess the format is <vendor>, <model>
>+            try:
>+                if ',' in model:
>+                    vendor = model.split(',')[0]
>+                    model = model.split(',')[1]
>+            except:
>+                pass
>+            
>             f.close()
>-        elif arch in ['s390','s390x']:
>-            vendor = 'IBM'
>-            make = 'eServer zSeries'
>+        # IBM-likely arches
>+        if arch in ['s390','s390x', "ppc", "ppc64"]:
>+            if not vendor:
>+                vendor = 'IBM'
>+            if not make:
>+                make = 'IBM'
>+            if not model:
>+                model = arch
>+
>             
>         
>         self.certification.setHardware(Tags.model, model)

Actions: View | Diff

Attachments on bug 822690: 587413