From 4d6901257e2c67dbb67e4e13e7be9ae4661ae598 Mon Sep 17 00:00:00 2001 From: crouzet Date: Wed, 19 Aug 2020 15:37:43 +0200 Subject: [PATCH] =?utf8?q?sat=20#19894=20:=20utilise=20maintenant=20le=20f?= =?utf8?q?ichier=20de=20configuration=20d'un=20module=20pour=20savoir=20s'?= =?utf8?q?il=20a=20=C3=A9t=C3=A9=20compil=C3=A9=20dans=20tous=20les=20cas?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/product.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/product.py b/src/product.py index 7311ba7..d661af1 100644 --- a/src/product.py +++ b/src/product.py @@ -872,19 +872,9 @@ def check_installation(config, product_info): return True install_dir = product_info.install_dir - if ( (src.appli_test_property(config,"single_install_dir", "yes") and - src.product.product_test_property(product_info,"single_install_dir", "yes")) or - (src.appli_test_property(config,"pip", "yes") and - src.product.product_test_property(product_info,"pip", "yes") and - src.appli_test_property(config,"pip_install_dir", "python") ) ): - # if the product is installed in the single install dir, or in python (for pip managed products) - # we check the product file in state of the install directory. - filename = CONFIG_FILENAME + product_info.name + ".pyconf" - if not os.path.exists(os.path.join(install_dir, filename)): - return False - else: - if not os.path.exists(install_dir): - return False + 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 -- 2.39.2