From d26780dd2d979a7dfbe2f2c845b627a229899132 Mon Sep 17 00:00:00 2001 From: Christian Van Wambeke Date: Tue, 16 Oct 2018 14:11:55 +0200 Subject: [PATCH] #8691 fixed sat prepare s'arrete si option build_source script et compil_script absent --- src/product.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/product.py b/src/product.py index 45cfef8..77fd3c6 100644 --- a/src/product.py +++ b/src/product.py @@ -228,19 +228,21 @@ Please provide a 'compil_script' key in its definition.""") % product_name # Only a name is given. Search in the default directory script_path = src.find_file_in_lpath(script_name, config.PATHS.PRODUCTPATH, "compil_scripts") if not script_path: - msg = _("Compilation script not found: %s") % script_name + msg = _("Compilation script %s not found in") % script_name DBG.tofix(msg, config.PATHS.PRODUCTPATH, True) # say where searched - raise src.SatException(msg) + # avoid stop if sat prepare, script could be included in sources, only warning + # raise src.SatException(msg) + script_path = "*** Not Found: %s" % script_name prod_info.compil_script = script_path # Check that the script is executable - if not os.access(prod_info.compil_script, os.X_OK): + if os.path.exists(prod_info.compil_script) and not os.access(prod_info.compil_script, os.X_OK): #raise src.SatException( # _("Compilation script cannot be executed: %s") % # prod_info.compil_script) # just as warning, problem later... - DBG.tofix("Compilation script is not execute mode file", prod_info.compil_script, True) + DBG.tofix("Compilation script file is not in 'execute mode'", prod_info.compil_script, True) # Get the full paths of all the patches if product_has_patches(prod_info): -- 2.39.2