don't skip mesa env at build time

diff --git a/commands/compile.py b/commands/compile.py
index 903e64ba609b9fc04b42bcfb58e20cb453da3835..9b51a87a56dd1e509874736f264133dbcb82eb10 100644 (file)
--- a/commands/compile.py
+++ b/commands/compile.py
@@ -342,7 +342,7 @@ def compile_all_products(sat, config, options, products_infos, logger):
         # Check if sources was already successfully installed
         check_source = src.product.check_source(p_info)
         if not check_source:
-            logger.write(_("Sources of product not found (try 'sat -h prepare') "))
+            logger.write(_("Sources of product not found (try 'sat -h prepare') \n"))
             res += 1 #BUG
             continue
         

diff --git a/src/environment.py b/src/environment.py
index 56ba0b81ac3e84b069ff84a2f3de6cf2ff208e35..de7faa5ff713b073ad73344e8f2b2f8a33c7fa8b 100644 (file)
--- a/src/environment.py
+++ b/src/environment.py
@@ -522,18 +522,19 @@ class SalomeEnviron:
         # Get the informations corresponding to the product
         pi = src.product.get_product_config(self.cfg, product)
 
-        # skip mesa product, unless use_mesa property was activated
-        
-        if not ("APPLICATION" in self.cfg  and
-                "properties" in self.cfg.APPLICATION  and
-                "use_mesa" in self.cfg.APPLICATION.properties  and
-                self.cfg.APPLICATION.properties.use_mesa == "yes") :
-            if ("properties" in pi and
-                "is_mesa" in pi.properties  and
-                pi.properties.is_mesa == "yes") :
-                logger.write(_("Skip mesa product %s\n") % pi.name, 4)
-                return
-           
+        # skip mesa products (if any) at run time, 
+        # unless use_mesa property was activated
+        if not self.forBuild:
+            if not ("APPLICATION" in self.cfg  and
+                    "properties" in self.cfg.APPLICATION  and
+                    "use_mesa" in self.cfg.APPLICATION.properties  and
+                    self.cfg.APPLICATION.properties.use_mesa == "yes") :
+                if ("properties" in pi and
+                    "is_mesa" in pi.properties  and
+                    pi.properties.is_mesa == "yes") :
+                    logger.write(_("Skip mesa product %s\n") % pi.name, 4)
+                    return
+               
         
         if self.for_package:
             pi.install_dir = os.path.join("out_dir_Path",