]> SALOME platform Git repositories - tools/sat.git/commitdiff
Salome HOME
for fixed products, use directory to evaluate if dependency is compiled
authorcrouzet <nicolas.crouzet@cea.fr>
Mon, 24 Aug 2020 08:22:07 +0000 (10:22 +0200)
committercrouzet <nicolas.crouzet@cea.fr>
Mon, 24 Aug 2020 08:22:07 +0000 (10:22 +0200)
src/product.py

index 1185c205c3f46f371fa7595c2656bcbc1c9569e1..7d73a505bd31fe727895c647cc6a1ad210372fd6 100644 (file)
@@ -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