From: Serge Rehbinder <serge.rehbinder@cea.fr>
Date: Tue, 20 Sep 2016 14:11:03 +0000 (+0200)
Subject: bug fix: do not try to get config from a product not in dependencies when compiling
X-Git-Tag: 5.0.0a1~111
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7125d682d6c4fd0c0cecfccca5c7dc8018c2ffe3;p=tools%2Fsat.git

bug fix: do not try to get config from a product not in dependencies when compiling
---

diff --git a/src/environment.py b/src/environment.py
index 5ad12b0..35e3c15 100644
--- a/src/environment.py
+++ b/src/environment.py
@@ -356,10 +356,6 @@ class SalomeEnviron:
                                    "resources",
                                    profile_product.lower() ) )
         
-        # The list of products to launch
-        lProductsName = self.get_names(self.cfg.APPLICATION.products.keys())
-        
-        self.set( "SALOME_MODULES",    ','.join(lProductsName))
 
     def set_salome_minimal_product_env(self, product_info, logger):
         """Sets the minimal environment for a SALOME product.
@@ -669,6 +665,11 @@ class FileEnvWriter:
         else:
             # set env from the APPLICATION
             env.set_application_env(self.logger)
+            
+            # The list of products to launch
+            lProductsName = env.get_names(self.cfg.APPLICATION.products.keys())
+            env.set( "SALOME_MODULES",    ','.join(lProductsName))
+            
             # set the products
             env.set_products(self.logger,
                             src_root=self.src_root)
@@ -713,6 +714,10 @@ class FileEnvWriter:
             # set env from PRODUCT
             env.set_application_env(self.logger)
 
+            # The list of products to launch
+            lProductsName = env.get_names(self.cfg.APPLICATION.products.keys())
+            env.set( "SALOME_MODULES",    ','.join(lProductsName))
+
             # set the products
             env.set_products(self.logger,
                             src_root=self.src_root)