From: crouzet <nicolas.crouzet@cea.fr>
Date: Wed, 4 Sep 2019 09:53:32 +0000 (+0200)
Subject: sat #17294 : pas de clean install pour les produits pip installés dans python - modif... 
X-Git-Tag: 5.5.0~36
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=75af48a9ea3aad9674de1c3edba1f2292b723b9c;p=tools%2Fsat.git

sat #17294 : pas de clean install pour les produits pip installés dans python - modification des commandes pip
---

diff --git a/commands/compile.py b/commands/compile.py
index 47a3d4b..d443757 100644
--- a/commands/compile.py
+++ b/commands/compile.py
@@ -260,8 +260,14 @@ def compile_all_products(sat, config, options, products_infos, all_products_dict
         
         if res_prod != 0:
             res += 1
-            
-            if error_step != "CHECK":
+            # there was an error, we clean install dir, unless :
+            #  - the error step is "check", or
+            #  - the product is managed by pip and installed in python dir
+            do_not_clean_install=False
+            if (error_step == "CHECK") or (is_pip and \
+                src.appli_test_property(config,"pip_install_dir", "python")) :
+                do_not_clean_install=True
+            if not do_not_clean_install:
                 # Clean the install directory if there is any
                 logger.write(_(
                             "Cleaning the install directory if there is any\n"),
@@ -474,6 +480,7 @@ def compile_product_pip(sat,
         #log_res_step(logger, res)
         res=1
         error_step = "PIP"
+        logger.write("\nError in pip command, please consult details with sat log command's internal traces\n", 5)
 
     return res, len_end_line, error_step 
 
diff --git a/src/internal_config/salomeTools.pyconf b/src/internal_config/salomeTools.pyconf
index 2b93e11..4e9a8d5 100644
--- a/src/internal_config/salomeTools.pyconf
+++ b/src/internal_config/salomeTools.pyconf
@@ -16,8 +16,8 @@ INTERNAL :
     }
     command :
     {
-        pip_download : "pip3 download --disable-pip-version-check"
-        pip_install : "pip3 install --disable-pip-version-check --no-index"
+        pip_download : "python -m pip download --disable-pip-version-check"
+        pip_install : "python -m pip install --disable-pip-version-check --no-index"
     }
 }
 PRODUCTS :