spns #26801 : bug sat package, le lanceur ne faisait pas le réinit

et aussi amélioration de sat launcher, ne plus pointer vers le module SALOME si celui-ci n'est pas présent!

diff --git a/commands/launcher.py b/commands/launcher.py
index bfbdc92802771b29c2b41a72957932e933f74955..ea7cc82136738a343d63a2ecde9c1becc34f72f4 100644 (file)
--- a/commands/launcher.py
+++ b/commands/launcher.py
@@ -136,7 +136,9 @@ def generate_launch_file(config,
     for prod_name, prod_info in l_product_info:
         # look for a salome application
         if src.get_property_in_product_cfg(prod_info, "is_salome_application") == "yes":
-            salome_application_name=prod_info.install_dir
+            # if user choose -p option (env_info not None), the set appli name only if product was selected.
+            if env_info == None or ( prod_name in env_info):
+                salome_application_name=prod_info.install_dir
             continue
 
     # if the application contains an application module, we set ABSOLUTE_APPLI_PATH to it.

diff --git a/commands/package.py b/commands/package.py
index fb62fdc51c3f142b5ed160194bc1f49f5fb97ecf..236ff65c185cd1738ae9624d1eb3b9868ce5e1c8 100644 (file)
--- a/commands/package.py
+++ b/commands/package.py
@@ -318,7 +318,7 @@ def produce_relative_launcher(config,
                           False,  # for launch
                           "cfgForPy",
                           additional_env=additional_env,
-                          no_path_init="False",
+                          no_path_init=False,
                           for_package = binaries_dir_name)
     
     # Little hack to put out_dir_Path outside the strings