From: crouzet <nicolas.crouzet@cea.fr>
Date: Wed, 19 Aug 2020 13:37:43 +0000 (+0200)
Subject: sat #19894 : utilise maintenant le fichier de configuration d'un module pour savoir... 
X-Git-Tag: 5.6.1^2~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4d6901257e2c67dbb67e4e13e7be9ae4661ae598;p=tools%2Fsat.git

sat #19894 : utilise maintenant le fichier de configuration d'un module pour savoir s'il a été compilé dans tous les cas
---

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