From 22e8fff3afde9323842ae75323e4b8fbb3db9fe8 Mon Sep 17 00:00:00 2001 From: crouzet Date: Thu, 21 Mar 2019 11:08:15 +0100 Subject: [PATCH] =?utf8?q?spns=20#16728=20:=20correction=20d'une=20message?= =?utf8?q?=20d'erreur=20erron=C3=A9=20qui=20prend=20beaucoup=20trop=20de?= =?utf8?q?=20place!?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/product.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/product.py b/src/product.py index 45afabc..4ae5d05 100644 --- a/src/product.py +++ b/src/product.py @@ -177,6 +177,7 @@ def get_product_config(config, product_name, with_install_dir=True): if depend in config.APPLICATION.products: prod_info.depend.append(depend,'') + # In case of a product get with a vcs, # put the tag (equal to the version) if prod_info is not None and prod_info.get_source in AVAILABLE_VCS: @@ -546,17 +547,10 @@ def add_compile_config_file(p_info, config): with open(aFile, 'w') as f: p_info.__save__(f, evaluated=True) # evaluated expressions mode except: - DBG.write("cannot evaluate product info - problem in file %s" % aFile, p_info, True) - # write DBG mode, as no problem if evaluation not possible - msg = """\ -# Some informations cannot be evaluated. -# for example: -# In the context of non VCS archives, information on git server is not available. + # sometime some information cannot be evaluated. + # for example, in the context of non VCS archives, information on git server is not available. + DBG.write("Warning : sat was not able to evaluate and write down some information in file %s" % aFile) -""" - with open(aFile, 'w') as f: - f.write(msg) - f.write(DBG.getStrConfigDbg(p_info)) def check_config_exists(config, prod_dir, prod_info, verbose=False): """\ -- 2.30.2