Author: gnichols
Date: 2011-07-07 18:51:28 +0000 (Thu, 07 Jul 2011)
New Revision: 985
Modified:
trunk/tests/info/info.py
Log:
714848 - Preview kernel taint should be error but not warning\n 708046 - info.py
backtraces in checkModuleVenderAndBuildHost with v7CommandException is not defined
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2011-07-07 18:48:23 UTC (rev 984)
+++ trunk/tests/info/info.py 2011-07-07 18:51:28 UTC (rev 985)
@@ -56,10 +56,13 @@
taintedFile = open("/proc/sys/kernel/tainted", "r")
tainted = int(taintedFile.readline())
if tainted != 0:
- print "Warning: kernel is tainted (value = %u)" % tainted
if tainted != Constants.TAINT_UNSIGNED_MODULE:
# fail for taints other than unsigned modules; modules will be
checked later
+ print "Error: kernel is tainted (value = %u)" % tainted
success = False
+ else:
+ print "Warning: kernel is tainted (value = %u)" % tainted
+
if tainted & Constants.TAINT_PROPRIETARY_MODULE:
print "Please remove the non-GPL modules."
if tainted & Constants.TAINT_TECHPREVIEW_MODULE:
@@ -221,7 +224,7 @@
if "redhat.com" not in buildhost:
print "Error: Driver module %s was built on %s and not built at Red
Hat." % (module, buildhost)
result = False
- except v7CommandException, exception:
+ except V7CommandException, exception:
print "Error: could not determine driver packaging info for module
%s" % module
print exception
result = False
Show replies by date