Author: gnichols
Date: 2012-04-20 13:13:40 +0000 (Fri, 20 Apr 2012)
New Revision: 1286
Modified:
trunk/v7/catalog.py
Log:
813405 - v7 should not prompt for certification id when hardware catalog is unreachable\n
813090 - v7 plan fails when the Hardware Catalog Server is not reachable from the SUT\n
809026 - v7 trivial formatting fix
Modified: trunk/v7/catalog.py
===================================================================
--- trunk/v7/catalog.py 2012-04-20 13:08:22 UTC (rev 1285)
+++ trunk/v7/catalog.py 2012-04-20 13:13:40 UTC (rev 1286)
@@ -52,7 +52,7 @@
def getCertificationID(self, resultsDocument):
if not self.isReachable():
print "Could not reach the Red Hat Hardware Catalog %s" %
self.getCatalogServer()
- answer = "existing"
+ answer = "none"
else:
# otherwise
while True:
@@ -67,7 +67,7 @@
pass
if answer not in answers:
- print "Please enter one of the following: %s" %
"".join(answers)
+ print "Please enter one of the following: %s" % " |
".join(answers)
else:
break
@@ -77,10 +77,9 @@
while True:
id = self.ui.prompt("Please enter the certification ID:")
try:
- if id != "":
- int(id)
- resultsDocument.setCertificationID(id)
- return True
+ int(id)
+ resultsDocument.setCertificationID(id)
+ return True
except ValueError:
print "%s is not a valid ID, it must be an integer. Enter 0 if
ID is unknown"
# otherwise
Show replies by date