Attachment 578383 Details for Bug 809240 – hardwaretest.py patch to use same prompts for both initial plan and edit of certification info

[patch] hardwaretest.py patch to use same prompts for both initial plan and edit of certification info

hardwaretest.patch (text/plain), 3.18 KB, created by Greg Nichols on 2012-04-18 15:08:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-04-18 15:08:58 UTC

Size: 3.18 KB

patch

obsolete

>Index: hardwaretest.py
>===================================================================
>--- hardwaretest.py	(revision 1278)
>+++ hardwaretest.py	(working copy)
>@@ -246,7 +246,7 @@
>                                           self.certification.getHardware(Tags.model))
>             self.getOSInfo()
>             if self.options.mode != Constants.auto:
>-                self.catalog.getCertificationID(self.certification)
>+                self.editCertification()
>             
>             # save the certification info off to certification.xml
>             certificationDocument = CertificationDocument()
>@@ -1124,25 +1124,11 @@
>         elif arch in ['s390','s390x']:
>             vendor = 'IBM'
>             make = 'eServer zSeries'
>-        
>-        # try asking the humans for it
>-        if self.options.mode == Constants.normal:
>-            print "Please verify the vendor, make, and model:"
>             
>-            vendor = self.ui.promptEdit("Vendor: ", vendor)
>-            if vendor:
>-                self.certification.setHardware(Tags.vendor, vendor)
>-            make = self.ui.promptEdit("Make: ", make)
>-            if make:
>-                self.certification.setHardware(Tags.make, make)
>-            model = self.ui.promptEdit("Model: ", model)
>-            if model:
>-                self.certification.setHardware(Tags.model, model)
>-            
>-        else: # --mode auto
>-            self.certification.setHardware(Tags.model, model)
>-            self.certification.setHardware(Tags.make, make)
>-            self.certification.setHardware(Tags.vendor, vendor)
>+        
>+        self.certification.setHardware(Tags.model, model)
>+        self.certification.setHardware(Tags.make, make)
>+        self.certification.setHardware(Tags.vendor, vendor)
>                 
> 
>     def getArch(self):
>@@ -1408,21 +1394,25 @@
>         
>                 
>         certificationID = self.certification.getCertificationID()
>-        answers = None
>-        if certificationID:
>+
>+        # if the certification id isn't set yet - see if they want to use the catalog  
>+        if not certificationID:
>+            self.catalog.getCertificationID(self.certification)
>+        # else, let them edit it directly    
>+        else:
>             answers = list()
>             answers.append(str(certificationID))
>-        while True:
>-            value = self.ui.prompt("\nPlease enter the certification ID:", answers)
>-            if not value:
>-                break
>-            try:
>-                int(value)
>-                break
>-            except ValueError:
>-                print "Error: %s is not an integer." % value
>-        if value and int(value) >= 0:
>-            self.certification.setCertificationID(value)
>+            while True:
>+                value = self.ui.prompt("\nPlease enter the certification ID:", answers)
>+                if not value:
>+                    break
>+                try:
>+                    int(value)
>+                    break
>+                except ValueError:
>+                    print "Error: %s is not an integer." % value
>+            if value and int(value) >= 0:
>+                self.certification.setCertificationID(value)
>         
>    
>         # copy over to certification.xml

Actions: View | Diff

Attachments on bug 809240: 578383 | 578384 | 578389