From f191001deb29798193fe252df39a5b559dc1c393 Mon Sep 17 00:00:00 2001 From: cvw Date: Fri, 26 Jul 2013 13:16:14 +0000 Subject: [PATCH] bug recursive history xml_parser --- bin/launchConfigureParser.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py index 4d484ffd0..43c334e41 100755 --- a/bin/launchConfigureParser.py +++ b/bin/launchConfigureParser.py @@ -252,7 +252,8 @@ def process_containers_params( standalone, embedded ): section_to_skip = "" class xml_parser: - def __init__(self, fileName, _opts, _importHistory=[] ): + def __init__(self, fileName, _opts, _importHistory): + #warning _importHistory=[] is NOT good: is NOT empty,reinitialized after first call if verbose(): print "Configure parser: processing %s ..." % fileName self.fileName = os.path.abspath(fileName) self.importHistory = _importHistory @@ -930,7 +931,7 @@ def get_env(theAdditionalOptions=[], appname=salomeappname, cfgname=salomecfgnam if verbose(): print "Configure parser: Warning : can not find configuration file %s" % filename else: try: - p = xml_parser(filename, _opts) + p = xml_parser(filename, _opts, []) _opts = p.opts except: if verbose(): print "Configure parser: Error : can not read configuration file %s" % filename @@ -948,7 +949,7 @@ def get_env(theAdditionalOptions=[], appname=salomeappname, cfgname=salomecfgnam if verbose(): print "Configure parser: Warning : can not find user configuration file" else: try: - p = xml_parser(user_config, _opts) + p = xml_parser(user_config, _opts, []) _opts = p.opts except: if verbose(): print 'Configure parser: Error : can not read user configuration file' @@ -1150,6 +1151,9 @@ def get_env(theAdditionalOptions=[], appname=salomeappname, cfgname=salomecfgnam #elif os.path.exists( "%s/%s.xml"%(d2, appname) ): elif os.path.exists( "%s/%s.xml"%(d2, salomeappname) ): dirs.append( d2 ) + else: + #print "* '"+m+"' should be deleted from ",args[modules_nam] + pass # Test if cmd_opts.test_script_file is not None: -- 2.39.2