fix #12327 Mauvaise exception après un sat -h prepare

diff --git a/src/__init__.py b/src/__init__.py
index e3a2ae8303dfb7b8a8ea7f6986bb44f067d21ad0..c5535d573c4d9f5346dd111c43f6b600f12182d6 100644 (file)
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -71,8 +71,7 @@ def check_config_has_application( config, details = None ):
     :param config class 'common.pyconf.Config': The config.
     """
     if 'APPLICATION' not in config:
-        message = _("An APPLICATION is required. Use 'config --list' to get"
-                    " the list of available applications.\n")
+        message = _("An APPLICATION is required. Use 'config --list' to get the list of available applications.\n")
         if details :
             details.append(message)
         raise SatException( message )

diff --git a/src/salomeTools.py b/src/salomeTools.py
index 1ad0b02ae5aa24d35d9101922d17d3a1277e4adc..01616cd9ccb0ebf6fcb7b777792f4f99082825ad 100755 (executable)
--- a/src/salomeTools.py
+++ b/src/salomeTools.py
@@ -461,7 +461,12 @@ class Sat(object):
                                              src.printcolors.printcWarning(msg),
                                              str(e)))
                         self.options.logs_paths_in_file = None
-                
+
+
+                # do nothing more if help is True
+                if self.options.help:
+                  return 0
+
                 options_launched = ""
                 res = None
                 try: