Author: gnichols
Date: 2011-07-15 16:35:12 +0000 (Fri, 15 Jul 2011)
New Revision: 1015
Modified:
trunk/v7/hardwaretest.py
Log:
711155 - v7: sh: kudzu: command not found
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-07-15 16:33:31 UTC (rev 1014)
+++ trunk/v7/hardwaretest.py 2011-07-15 16:35:12 UTC (rev 1015)
@@ -62,6 +62,7 @@
self.runMode = self.options.mode
self.command = None
self.virtualization = None
+ self.redHatRelease = RedHatRelease()
self.commands = {'plan': self.doPlan,
'verify': self.doVerify,
@@ -237,15 +238,15 @@
print "Hardware: %s %s %s" %
(self.certification.getHardware(Tags.vendor),
self.certification.getHardware(Tags.make),
self.certification.getHardware(Tags.model))
- redHatRelease = RedHatRelease()
- self.certification.setOS(Tags.name, redHatRelease.getCodeName())
- if redHatRelease.getVersionPointUpdate():
- self.certification.setOS(Tags.release,
redHatRelease.getVersionPointUpdate())
+
+ self.certification.setOS(Tags.name, self.redhatRelease.getCodeName())
+ if self.redhatRelease.getVersionPointUpdate():
+ self.certification.setOS(Tags.release,
self.redhatRelease.getVersionPointUpdate())
else:
print "Error: could not determine OS release number"
return False
- if redHatRelease.getProduct():
- self.certification.setOS(Tags.product, redHatRelease.getProduct())
+ if self.redhatRelease.getProduct():
+ self.certification.setOS(Tags.product, self.redhatRelease.getProduct())
else:
print "Error: could not determine OS product name"
return False
@@ -771,14 +772,15 @@
syslog.syslog("Test error: %s" % e)
success = False
- # use Kudzu for old rhr's hardware.out
- if self.debugLevel != Constants.off:
- print "Getting devices from kudzu"
- kudzu = Kudzu()
- if not kudzu.isValid():
- success = False
- else:
- run.appendDevices(deviceClass.getDevicesFromDetector(kudzu))
+ # use Kudzu for old rhr's hardware.out
+ if self.redHatRelease.getVersion() < 6:
+ if self.debugLevel != Constants.off:
+ print "Getting devices from kudzu"
+ kudzu = Kudzu()
+ if not kudzu.isValid():
+ success = False
+ else:
+ run.appendDevices(deviceClass.getDevicesFromDetector(kudzu))
return success
Show replies by date