From: Serge Rehbinder <serge.rehbinder@cea.fr>
Date: Tue, 24 Jan 2017 14:05:06 +0000 (+0100)
Subject: Revert "sat patch: call system command 'patch' instead of 'patching.py'"
X-Git-Tag: 5.0.0a1~38^2~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5ecf1635226a2b75e5fbf9dc9b3a6e4085972b79;p=tools%2Fsat.git

Revert "sat patch: call system command 'patch' instead of 'patching.py'"

This reverts commit 6e48c6e475db2d9b55775180b0749e7cc5f051de.
---

diff --git a/commands/patch.py b/commands/patch.py
index 23ed3d5..c3525f8 100644
--- a/commands/patch.py
+++ b/commands/patch.py
@@ -80,9 +80,9 @@ def apply_patch(config, product_info, max_product_name_len, logger):
         
         # Check the existence and apply the patch
         if os.path.isfile(patch):
-            patch_exe = "patch" # old patch command (now replace by patching.py)
-            #patch_exe = os.path.join(config.VARS.srcDir, "patching.py")
-            patch_cmd = "%s -p1 < %s" % (patch_exe, patch)
+            #patch_exe = "patch" # old patch command (now replace by patching.py)
+            patch_exe = os.path.join(config.VARS.srcDir, "patching.py")
+            patch_cmd = "python %s -p1 -- < %s" % (patch_exe, patch)
 
             # Write the command in the terminal if verbose level is at 5
             logger.write(("    >%s\n" % patch_cmd),5)