r1317 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-17 18:40:08 +0000 (Thu, 17 May 2012)
New Revision: 1317
Modified:
trunk/Makefile
Log:
R26
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-05-16 16:14:26 UTC (rev 1316)
+++ trunk/Makefile 2012-05-17 18:40:08 UTC (rev 1317)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 25
+V7_RELEASE := 26
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
11 years, 12 months
r1316 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 16:14:26 +0000 (Wed, 16 May 2012)
New Revision: 1316
Added:
tags/v7-V1-5R25/
Log:
tag version
11 years, 12 months
r1315 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 16:09:01 +0000 (Wed, 16 May 2012)
New Revision: 1315
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-05-16 16:08:32 UTC (rev 1314)
+++ trunk/v7.spec.in 2012-05-16 16:09:01 UTC (rev 1315)
@@ -82,7 +82,7 @@
%changelog
* Wed May 16 2012 Greg Nichols <gnichols(a)redhat.com>
-V7 1.5 R24
+V7 1.5 R25
818184 - input check is needed for hardware 'category' field
707144 - Regression with BLURAY test in v7 version 1.3-43-el6
11 years, 12 months
r1314 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 16:08:32 +0000 (Wed, 16 May 2012)
New Revision: 1314
Modified:
trunk/Makefile
Log:
R25
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-05-16 16:08:02 UTC (rev 1313)
+++ trunk/Makefile 2012-05-16 16:08:32 UTC (rev 1314)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 24
+V7_RELEASE := 25
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
11 years, 12 months
r1313 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 16:08:02 +0000 (Wed, 16 May 2012)
New Revision: 1313
Modified:
trunk/v7/redhatrelease.py
Log:
817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2012-05-16 15:22:36 UTC (rev 1312)
+++ trunk/v7/redhatrelease.py 2012-05-16 16:08:02 UTC (rev 1313)
@@ -24,6 +24,7 @@
self.codeName = None
self.candidate = None
self.valid = False
+ self.text = None
self.__read(file)
11 years, 12 months
r1312 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 15:22:36 +0000 (Wed, 16 May 2012)
New Revision: 1312
Added:
tags/v7-V1-5R24/
Log:
tag version
11 years, 12 months
r1311 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 15:22:07 +0000 (Wed, 16 May 2012)
New Revision: 1311
Modified:
trunk/v7.spec.in
Log:
changlog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-05-16 15:20:46 UTC (rev 1310)
+++ trunk/v7.spec.in 2012-05-16 15:22:07 UTC (rev 1311)
@@ -80,6 +80,14 @@
%changelog
+* Wed May 16 2012 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.5 R24
+
+ 818184 - input check is needed for hardware 'category' field
+ 707144 - Regression with BLURAY test in v7 version 1.3-43-el6
+ 817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
+
* Mon May 14 2012 Greg Nichols <gnichols(a)redhat.com>
V7 1.5 R23
11 years, 12 months
r1310 - in trunk: tests/info v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 15:20:46 +0000 (Wed, 16 May 2012)
New Revision: 1310
Modified:
trunk/tests/info/info.py
trunk/v7/redhatrelease.py
Log:
817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-05-16 15:19:04 UTC (rev 1309)
+++ trunk/tests/info/info.py 2012-05-16 15:20:46 UTC (rev 1310)
@@ -135,12 +135,27 @@
modules.append(match.group("mod_name"))
procModules.close()
return modules
+
+ def checkKernelIsGA(self):
+ release = self.redHatRelease
+ # if kernel is RT
+ if self.redHatRelease.getKernelFlavor() == Constants.rt:
+ # if etc realtime release file is found, use it as the release name
+ print "Kernel is real-time"
+ if self.redHatRelease.getRealTimeRelease():
+ release = self.redHatRelease.getRealTimeRelease()
+ # else, warn - disable check
+ else:
+ print "Warning: the running kernel is a realtime kernel %s, but product release information could not be found"
+ return True
+
+ return self.__checkKernelIsGA(release)
- def checkKernelIsGA(self):
+ def __checkKernelIsGA(self, release):
- if "Red Hat"not in self.redHatRelease.getProduct() or self.redHatRelease.getVersion() < 5:
- print "Warning: could not check kernel GA status for %s version %s" % (self.redHatRelease.getProduct(), self.redHatRelease.getVersion())
+ if "Red Hat"not in release.getProduct() or (release.getProduct() == "Red Hat Enterprise Linux" and self.redHatRelease.getVersion() < 5):
+ print "Warning: could not check kernel GA status for %s version %s" % (release.getProduct(), release.getVersion())
# return True
kernelInfo = None
@@ -179,22 +194,22 @@
if self.debug is not Constants.off:
print "reading kernel info file " + kernelInfoFile
kernelInfo = KernelInfo(kernelInfoFile)
- RHELGAKernel = kernelInfo.getGAKernel(self.redHatRelease.getVersion(), self.redHatRelease.getUpdate())
+ RHELGAKernel = kernelInfo.getGAKernel(release.getVersion(), release.getUpdate())
if RHELGAKernel:
- if self.redHatRelease.getKernelVersionRelease() == RHELGAKernel:
- print "Kernel is RHEL %s.%s GA: %s" % (self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
+ if release.getKernelVersionRelease() == RHELGAKernel:
+ print "Kernel is RHEL %s.%s GA: %s" % (release.getVersion(), release.getUpdate(), RHELGAKernel)
return True
# allow partial matches from the left-end of the V-R string
try:
- if self.redHatRelease.getKernelVersionRelease().index(RHELGAKernel) is 0:
- print "Warning: Kernel %s is a partial match RHEL %s.%s GA (%s)." % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
+ if release.getKernelVersionRelease().index(RHELGAKernel) is 0:
+ print "Warning: Kernel %s is a partial match RHEL %s.%s GA (%s)." % (release.getKernelVersionRelease(), release.getVersion(), release.getUpdate(), RHELGAKernel)
return True
except ValueError:
# no match, fall through to error
pass
# otherwise
- print "Error: Kernel is %s and not RHEL %s.%s GA (%s)" % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
+ print "Error: Kernel is %s and not RHEL %s.%s GA (%s)" % (release.getKernelVersionRelease(), release.getVersion(), release.getUpdate(), RHELGAKernel)
return False
except IOError:
print "Error: could not open kernel info file " + kernelInfoFile
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2012-05-16 15:19:04 UTC (rev 1309)
+++ trunk/v7/redhatrelease.py 2012-05-16 15:20:46 UTC (rev 1310)
@@ -14,35 +14,32 @@
# Author: Greg Nichols
#
import string, os, sys, re
+
+class Release:
+ def __init__(self, file):
-class RedHatRelease:
-
- def __init__(self):
self.product = None
self.version = None
self.update = None
self.codeName = None
self.candidate = None
self.valid = False
- self.kernel = None
- self.arch = None
- self.kernelRPMName = None
- self.kernelDevelRPMName = None
- self.kernelFlavor = None
- self.debugKernel = False
- self._read()
- self._parse()
- self.__getKernelInfo()
-
- def _read(self):
- f=open("/etc/redhat-release")
- self.text=f.readline()
- f.close()
- def _parse(self):
+ self.__read(file)
+ self.__parse()
+
+ def __read(self, file):
+ try:
+ f=open(file)
+ self.text=f.readline()
+ f.close()
+ except:
+ pass
+
+ def __parse(self):
if self.text:
- pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[0-9\.]+)(?P<candidate>[a-zA-Z0-9\ ]+)\((?P<name>[a-zA-Z0-9\ ]+)\)")
+ pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[0-9\.]+)(?P<candidate>[a-zA-Z0-9\ ]+)(\((?P<name>[a-zA-Z0-9\ ]+)\))?")
match = pattern.match(self.text)
if not match:
self.valid = False
@@ -65,7 +62,58 @@
self.update = int(nameParts[2])
if match.group("candidate") and len(match.group("candidate").strip()) > 0:
self.candidate = match.group("candidate").strip()
+
+
+ def isValid(self):
+ return self.valid and self.product and self.version
+
+ def getProduct(self): return self.product
+ def getVersion(self): return self.version
+ def getUpdate(self): return self.update
+ def getCodeName(self): return self.codeName
+ def getCandidate(self): return self.candidate
+ def getVersionPointUpdate(self):
+ if self.update:
+ return "%u.%u" % (self.version, self.update)
+ else:
+ return "%u" % self.version
+
+
+ def dump(self):
+ print ""
+ print self.text
+ print "-------------------------------"
+ print "Product: \"" + self.getProduct() + "\""
+ print "Version: \"" + str(self.getVersion()) + "\""
+ print "Update: \"" + str(self.getUpdate()) + "\""
+ print "Version.Update \"" + self.getVersionPointUpdate() + "\""
+ if self.candidate:
+ print "Candidate: \"" + self.getCandidate() + "\""
+ if self.codeName:
+ print "Code Name: \"" + self.getCodeName() + "\""
+ if not self.isValid():
+ print "Not Valid"
+ def parse(self):
+ self.__parse()
+
+class RedHatRelease(Release):
+
+ def __init__(self):
+ Release.__init__(self, "/etc/redhat-release")
+ self.kernel = None
+ self.arch = None
+ self.kernelRPMName = None
+ self.kernelDevelRPMName = None
+ self.kernelFlavor = None
+ self.debugKernel = False
+ self.realtimeRelease = None
+ self.kernelVersionRelease = None
+
+ self.realtimeRelease = Release("/etc/mrg-realtime-release")
+
+ self.__getKernelInfo()
+
def __getKernelInfo(self):
uname = os.popen('uname -r')
self.kernel = uname.readline()[:-1]
@@ -151,15 +199,10 @@
else:
return False
- def isValid(self):
- return self.valid and self.product and self.version and self.codeName
+
- def getProduct(self): return self.product
- def getVersion(self): return self.version
- def getUpdate(self): return self.update
- def getCodeName(self): return self.codeName
- def getCandidate(self): return self.candidate
+
def getKernelRPMName(self): return self.kernelRPMName
def getKernelDevelRPMName(self): return self.kernelDevelRPMName
def getKernel(self): return self.kernel
@@ -167,31 +210,27 @@
def getArch(self): return self.arch
def getKernelFlavor(self): return self.kernelFlavor
def kernelIsDebug(self): return self.debugKernel
+ def getRealTimeRelease(self):
+ if self.realtimeRelease and self.realtimeRelease.isValid():
+ return self.realtimeRelease
+ # otherwise
+ return None
- def getVersionPointUpdate(self):
- if self.update:
- return "%u.%u" % (self.version, self.update)
- else:
- return "%u" % self.version
def dump(self):
- print ""
- print self.text
- print "-------------------------------"
- print "Product: \"" + self.getProduct() + "\""
- print "Version: \"" + str(self.getVersion()) + "\""
- print "Update: \"" + str(self.getUpdate()) + "\""
- print "Version.Update \"" + self.getVersionPointUpdate() + "\""
+ Release.dump(self)
+
print "Kernel Version \"" + self.getKernelVersionRelease() + "\""
- if self.candidate:
- print "Candidate: \"" + self.getCandidate() + "\""
- print "Code Name: \"" + self.getCodeName() + "\""
- if not self.isValid():
- print "Not Valid"
+ if self.getRealTimeRelease():
+ print "Realtime:"
+ self.getRealTimeRelease().dump()
+
+
+
def unit_test():
PASSED = 0
FAILED = 1
@@ -206,13 +245,14 @@
"Red Hat Enterprise Linux release 4 (Bogus Update 3)",
"Red Hat Enterprise Linux Server release 5.5 Beta (Tikanga)",
"Red Hat Enterprise Linux release 6.0 Beta (Santiago)",
- "Red Hat Enterprise Linux Server release 7.0 Alpha1 (Maipo)"
+ "Red Hat Enterprise Linux Server release 7.0 Alpha1 (Maipo)",
+ "Red Hat MRG Realtime Linux release 2.2.0"
)
for text in texts:
print "\n"
redHatRelease.text = text
- redHatRelease._parse()
+ redHatRelease.parse()
redHatRelease.dump()
if not redHatRelease.isValid():
print "Error: text parsing failed"
11 years, 12 months
r1309 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 15:19:04 +0000 (Wed, 16 May 2012)
New Revision: 1309
Modified:
trunk/v7/opticalDiskTest.py
Log:
707144 - Regression with BLURAY test in v7 version 1.3-43-el6
Modified: trunk/v7/opticalDiskTest.py
===================================================================
--- trunk/v7/opticalDiskTest.py 2012-05-16 15:16:57 UTC (rev 1308)
+++ trunk/v7/opticalDiskTest.py 2012-05-16 15:19:04 UTC (rev 1309)
@@ -498,6 +498,8 @@
try:
Command("gconftool-2 --type bool --set /desktop/gnome/volume_manager/automount_media false").echo()
Command("gconftool-2 --type bool --set /desktop/gnome/volume_manager/autobrowse false").echo()
+ Command("gconftool-2 --type bool --set /apps/nautilus/preferences/media_automount False").echo()
+ Command("gconftool-2 --type bool --set /apps/nautilus/preferences/media_automount_open False").echo()
except V7CommandException, exception:
print exception
print "Warning: Can not turn off the automount and/or autobrowse for removable media."
11 years, 12 months
r1308 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-16 15:16:57 +0000 (Wed, 16 May 2012)
New Revision: 1308
Modified:
trunk/v7/commandLineUI.py
Log:
818184 - input check is needed for hardware category field
Modified: trunk/v7/commandLineUI.py
===================================================================
--- trunk/v7/commandLineUI.py 2012-05-16 15:15:46 UTC (rev 1307)
+++ trunk/v7/commandLineUI.py 2012-05-16 15:16:57 UTC (rev 1308)
@@ -85,11 +85,16 @@
label += " ("
label += "|".join(answers)
label += ") "
- readline.set_startup_hook(lambda: readline.insert_text(value))
- try:
- return raw_input(label)
- finally:
- readline.set_startup_hook()
+ while True:
+ readline.set_startup_hook(lambda: readline.insert_text(value))
+ try:
+ answer = raw_input(label)
+ if not answers or answer in answers:
+ return answer
+ # otherwise
+ print "Please enter one of the following: %s" % " | ".join(answers)
+ finally:
+ readline.set_startup_hook()
def promptPassword(self, message):
return getpass.getpass(message)
11 years, 12 months