changeset 111:5462291b66d5 2.00

Fixed mishandling of some variables in multi-problem legacy configurations
author Oleg Oshmyan <chortos@inbox.lv>
date Fri, 08 Apr 2011 19:22:19 +0300
parents 6d6d2c82e776
children f0b63838f407
files config.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/config.py	Fri Apr 08 17:45:53 2011 +0300
+++ b/config.py	Fri Apr 08 19:22:19 2011 +0300
@@ -112,6 +112,7 @@
 				with ReadDeleting(inputdatafname) as f:
 					module = imp.load_module('testconf', f, metafile.full_real_path, ('.py', 'r', imp.PY_SOURCE))
 			del sys.modules['testconf']
+	module = Config(module, globalconf)
 	if hasattr(module, 'padwithzeroestolength'):
 		if not hasattr(module, 'padtests'):
 			try:
@@ -128,9 +129,7 @@
 	    hasattr(module, 'maxtime')):
 		module.maxcputime = module.maxtime
 	for name in defaults_problem:
-		if not hasattr(globalconf, name):
-			setattr(module, name, getattr(module, name, defaults_problem[name]))
-	module = Config(module, globalconf)
+		setattr(module, name, getattr(module, name, defaults_problem[name]))
 	if not module.dummyinname:
 		module.dummyinname = getattr(module, 'testcaseinname', module.dummyinname)
 	if not module.dummyoutname: