From fe93dec3df59f9238c50e52cce21d939fa4ccc1c Mon Sep 17 00:00:00 2001 From: crouzet Date: Mon, 7 Jan 2019 17:39:32 +0100 Subject: [PATCH] correction bug introduit par 6cb6aac483a7d637f972f70e10500411e4cecfaf --- commands/script.py | 6 +++++- src/product.py | 21 --------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/commands/script.py b/commands/script.py index 1593a0e..575b56d 100644 --- a/commands/script.py +++ b/commands/script.py @@ -156,6 +156,10 @@ def run(args, runner, logger): # Get the list of products to treat products_infos = src.product.get_products_list(options, runner.cfg, logger) + products_infos = [pi for pi in products_infos if not( + src.product.product_is_native(pi[1]) or + src.product.product_is_fixed(pi[1]))] + # Print some informations logger.write(_('Executing the script in the build ' @@ -188,4 +192,4 @@ def run(args, runner, logger): 'valid_result': nb_products - res, 'nb_products': nb_products }, 1) - return res \ No newline at end of file + return res diff --git a/src/product.py b/src/product.py index 3eadca1..7ce6866 100644 --- a/src/product.py +++ b/src/product.py @@ -670,27 +670,6 @@ def get_products_list(options, cfg, logger): else: res = resAll # not existing properties as all accepted - - ok = [] - ko = [] - products_infos = [] - for p_name, p_info in res: - try: - if src.product.product_is_native(p_info) or src.product.product_is_fixed(p_info): - ko.append(p_name) - else: - products_infos.append((p_name, p_info)) - ok.append(p_name) - except: - msg = "problem on 'is_native' or 'is_fixed' for product %s" % p_name - raise Exception(msg) - - if len(ko) > 0: - logger.warning("on is_native or is_fixed\n products accepted:\n %s\n products rejected:\n %s\n" % - (PP.pformat(sorted(ok)), PP.pformat(sorted(ko)))) - - logger.debug("products selected:\n %s\n" % PP.pformat(sorted(ok))) - return res -- 2.39.2