From 4f11faf94fda002a0d2f6eed6aaf87518b505f69 Mon Sep 17 00:00:00 2001 From: crouzet Date: Fri, 21 Aug 2020 17:01:13 +0200 Subject: [PATCH] prend en compte les dependances de build dans le cas des produits en base --- src/product.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/product.py b/src/product.py index d661af1..1185c20 100644 --- a/src/product.py +++ b/src/product.py @@ -664,6 +664,13 @@ def check_config_exists(config, prod_dir, prod_info, verbose=False): DBG.write("check_config_exists 000", (prod_dir, l_dir_and_files), verbose) DBG.write("check_config_exists 111", prod_info, verbose) + depend_all=[] + if "depend" in prod_info: + for d in prod_info.depend: + depend_all.append(d) + if "build_depend" in prod_info: + for d in prod_info.build_depend: + depend_all.append(d) for dir_or_file in l_dir_and_files: oExpr = re.compile(config_expression) if not(oExpr.search(dir_or_file)): @@ -682,7 +689,7 @@ def check_config_exists(config, prod_dir, prod_info, verbose=False): # dependencies of the product config_corresponds = True compile_cfg = src.pyconf.Config(config_file) - for prod_dep in prod_info.depend: + for prod_dep in depend_all: # if the dependency is not in the config, # the config does not correspond if prod_dep not in compile_cfg: @@ -708,7 +715,7 @@ def check_config_exists(config, prod_dir, prod_info, verbose=False): break else: # as old compatibility without prod_name sat-config.pyconf files - if prod_name not in prod_info.depend: + if prod_name not in depend_all: # here there is an unexpected depend in an old compilation config_corresponds = False break -- 2.39.2