]> SALOME platform Git repositories - tools/sat.git/commitdiff
Salome HOME
Revert "sat patch: call system command 'patch' instead of 'patching.py'"
authorSerge Rehbinder <serge.rehbinder@cea.fr>
Tue, 24 Jan 2017 14:05:06 +0000 (15:05 +0100)
committerSerge Rehbinder <serge.rehbinder@cea.fr>
Tue, 24 Jan 2017 14:05:06 +0000 (15:05 +0100)
This reverts commit 6e48c6e475db2d9b55775180b0749e7cc5f051de.

commands/patch.py

index 23ed3d5021773f547913705f414d075ec7879fd4..c3525f8e6d6731487eb9537ea2dd135bd7b79135 100644 (file)
@@ -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)