Author: gnichols
Date: 2010-02-01 13:50:00 +0000 (Mon, 01 Feb 2010)
New Revision: 361
Modified:
trunk/v7/opticalDiskTest.py
Log:
560635 - info test fails due to difficulties in parsing /etc/redhat-release
Modified: trunk/v7/opticalDiskTest.py
===================================================================
--- trunk/v7/opticalDiskTest.py 2010-02-01 13:49:48 UTC (rev 360)
+++ trunk/v7/opticalDiskTest.py 2010-02-01 13:50:00 UTC (rev 361)
@@ -33,6 +33,8 @@
from v7.device import Device
from v7.command import Command, V7CommandException
from v7.v7kudzu import Kudzu
+from v7.redhatrelease import RedHatRelease
+
class OpticalDiskTest(Test):
def __init__(self, name):
@@ -86,8 +88,8 @@
def getRequiredRPMs(self):
rpms = ["dvd+rw-tools"]
- (osProduct, osVersion, osCodeName) = self.getRedHatRelease()
- if "Fedora" in osProduct or ("Red Hat" in osProduct and
"6" in osVersion):
+ redhat = RedHatRelease()
+ if "Fedora" in redhat.getProduct() or ("Red Hat" in
redhat.getProduct() and redhat.getVersion() is 6):
rpms.append("genisoimage") # for mkisofs
rpms.append("wodim") # for cdrecord
else:
Show replies by date