bug fix in clean command

diff --git a/commands/clean.py b/commands/clean.py
index 7bf04c3d721438f0eccb672b7fbb6a1465314596..03b934291fe3533b84b52e264358ab7a83937bf4 100644 (file)
--- a/commands/clean.py
+++ b/commands/clean.py
@@ -143,6 +143,7 @@ def run(args, runner, logger):
     # check that the command has been called with an application
     src.check_config_has_application( runner.cfg )
 
+    # Get the list of products to threat
     products_infos = prepare.get_products_list(options, runner.cfg, logger)
 
     # Construct the list of directories to suppress
@@ -159,10 +160,14 @@ def run(args, runner, logger):
         if options.build:
             l_dir_to_suppress += get_build_directories(products_infos)
             
-        if options.source:
+        if options.source or options.sources_without_dev:
             l_dir_to_suppress += get_source_directories(products_infos, 
                                                 options.sources_without_dev)
     
+    if len(l_dir_to_suppress) == 0:
+        logger.write(src.printcolors.printcWarning(_("Nothing to suppress\n")))
+        return
+    
     # Check with the user if he really wants to suppress the directories
     if not runner.options.batch:
         logger.write(_("Remove the following directories ?\n"), 1)

diff --git a/complete_sat.sh b/complete_sat.sh
index ac6f8e0a92f37726bf521b2b31c6a72b89945214..c56bb38b298db625f1db70e5a304aa09a4e27386 100755 (executable)
--- a/complete_sat.sh
+++ b/complete_sat.sh
@@ -80,7 +80,7 @@ _salomeTools_complete()
     # first argument => show available commands
     if [[ ${argc} == 1 ]]
     then
-        opts="config log testcommand source patch prepare --help"
+        opts="config log testcommand source patch prepare environ --help"
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
         return 0
     fi
@@ -154,6 +154,11 @@ _salomeTools_complete()
             COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
             return 0
             ;;
+        environ)
+            opts="--products --shell --prefix --target"
+            COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+            return 0
+            ;;
         *) return 0 ;;
     esac