aboutsummaryrefslogtreecommitdiffstats
path: root/bin/common/srtool_patcher.py
diff options
context:
space:
mode:
Diffstat (limited to 'bin/common/srtool_patcher.py')
-rwxr-xr-xbin/common/srtool_patcher.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/bin/common/srtool_patcher.py b/bin/common/srtool_patcher.py
index 17032750..86c74fb0 100755
--- a/bin/common/srtool_patcher.py
+++ b/bin/common/srtool_patcher.py
@@ -166,15 +166,9 @@ def extract_custom_patch(custom_file,clean_file,patch_file,label,patcher_dir,opt
if state != "LOOKING":
print("ERROR: START not STOPPED (%s)" % state)
- if INPLACE_TAG in options:
- cmd = "git diff %s > %s" % (custom_file,patch_file)
- print(cmd)
- os.system(cmd)
- print("In-place File: %s" % (clean_file))
- else:
- os.system("diff -u %s %s > %s" % (clean_file,custom_file,patch_file))
- print("Custom File: %s" % (custom_file))
- print("Clean File: %s" % (clean_file))
+ os.system("diff -u %s %s > %s" % (clean_file,custom_file,patch_file))
+ print("Custom File: %s" % (custom_file))
+ print("Clean File: %s" % (clean_file))
print("Patch File: %s" % (patch_file))
return(ret,clean_file,patch_file)
@@ -282,7 +276,7 @@ def clean_inplace(custom_file,original_file,patch_file,label,patcher_dir,options
print(cmd)
os.system(cmd)
- print("* Extract patch file (via 'git diff')")
+ print("* Extract patch file")
clean_file = custom_file + '.clean'
patch_file = custom_file + '.patch'
ret,clean_file,patch_file = extract_custom_patch(original_file,clean_file,patch_file,label,'',options)