A product without build_dir do not make check and clean commands crash

diff --git a/commands/check.py b/commands/check.py
index ecc83a0e69753295dc8f9d69d9b99315e90c08b1..b9e1528b21cbf4f9cdb4b668f88adc8d8783ffc9 100644 (file)
--- a/commands/check.py
+++ b/commands/check.py
@@ -89,6 +89,10 @@ def check_all_products(config, products_infos, logger):
     '''
     res = 0
     for p_name_info in products_infos:
+        __, p_info = p_name_info
+        if ("build_dir" not in  "build_dir" or 
+            not src.product.product_compiles(p_info)):
+            continue
         res_prod = check_product(p_name_info, config, logger)
         if res_prod != 0:
             res += 1 

diff --git a/commands/clean.py b/commands/clean.py
index 29934b6c37250ad120c38c6d7e96432cad8cdb4a..23ee598df499b2aeb1fa8986ff66bdbdd14e2a0c 100644 (file)
--- a/commands/clean.py
+++ b/commands/clean.py
@@ -72,7 +72,8 @@ def get_build_directories(products_infos):
     l_dir_build = []
     for __, product_info in products_infos:
         if product_has_dir(product_info):
-            l_dir_build.append(src.Path(product_info.build_dir))
+            if "build_dir" in product_info:
+                l_dir_build.append(src.Path(product_info.build_dir))
     return l_dir_build
 
 def get_install_directories(products_infos):
@@ -166,7 +167,6 @@ def run(args, runner, logger):
     
     if len(l_dir_to_suppress) == 0:
         logger.write(src.printcolors.printcWarning(_("Nothing to suppress\n")))
-        logger.write(src.printcolors.printcWarning("\n"))
         sat_command = (runner.cfg.VARS.salometoolsway +
                        runner.cfg.VARS.sep +
                        "sat -h clean") 

diff --git a/src/compilation.py b/src/compilation.py
index c0460027f65b99453d560105cea7813d8e9f77b9..59970c148ea9d881f4a9f2515c9067f6962b921c 100644 (file)
--- a/src/compilation.py
+++ b/src/compilation.py
@@ -207,7 +207,7 @@ CC=\\"hack_libtool\\"%g" libtool'''
 
     ##
     # Runs make to build the module.
-    def make(self, nb_proc, make_opt):
+    def make(self, nb_proc, make_opt=""):
 
         # make
         command = 'make'