# HG changeset patch
# User Oleg Oshmyan <chortos@inbox.lv>
# Date 1302279739 -10800
# Node ID 6589511f5418a5f4a10fd1d599b834baf238fe77
# Parent  aa0378ea1f939891547f58e9a3f2729fe3da6282
Fixed mishandling of some variables in multi-problem legacy configurations

diff -r aa0378ea1f93 -r 6589511f5418 config.py
--- a/config.py	Fri Apr 08 18:00:51 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: