From 824c9a28bc163ef4096545529bb1d0a4132a81e0 Mon Sep 17 00:00:00 2001 From: crouzet Date: Mon, 28 Mar 2022 09:30:38 +0200 Subject: [PATCH] =?utf8?q?spns=20#26801=20:=20bug=20sat=20package,=20le=20?= =?utf8?q?lanceur=20ne=20faisait=20pas=20le=20r=C3=A9init=20et=20aussi=20a?= =?utf8?q?m=C3=A9lioration=20de=20sat=20launcher,=20ne=20plus=20pointer=20?= =?utf8?q?vers=20le=20module=20SALOME=20si=20celui-ci=20n'est=20pas=20pr?= =?utf8?q?=C3=A9sent!?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- commands/launcher.py | 4 +++- commands/package.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/commands/launcher.py b/commands/launcher.py index bfbdc92..ea7cc82 100644 --- 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 fb62fdc..236ff65 100644 --- 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 -- 2.39.2