From: crouzet Date: Mon, 24 Aug 2020 08:22:07 +0000 (+0200) Subject: for fixed products, use directory to evaluate if dependency is compiled X-Git-Tag: 5.6.1^2~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9d7e015bd29754c40441d660dfa6ba539ca68e6b;p=tools%2Fsat.git for fixed products, use directory to evaluate if dependency is compiled --- diff --git a/src/product.py b/src/product.py index 1185c20..7d73a50 100644 --- a/src/product.py +++ b/src/product.py @@ -879,9 +879,15 @@ def check_installation(config, product_info): return True install_dir = product_info.install_dir - filename = CONFIG_FILENAME + product_info.name + ".pyconf" - if not os.path.exists(os.path.join(install_dir, filename)): - return False + if src.product.product_is_fixed(product_info): + # we check directly the install dir only for fixed products + # (there is no pyconf file in that case) + if not os.path.exists(install_dir): + return False + else: + filename = CONFIG_FILENAME + product_info.name + ".pyconf" + if not os.path.exists(os.path.join(install_dir, filename)): + return False # check extra files if specified in present_files.install section if ("present_files" in product_info and