Do not create .orig files after patching
This commit is contained in:
+1
-1
@@ -470,7 +470,7 @@ def do_patch(sourceDir, patchFile, level = 0):
|
|||||||
(ret, out, err) = run_batch('quilt push')
|
(ret, out, err) = run_batch('quilt push')
|
||||||
else:
|
else:
|
||||||
# run GNU patch to apply original patch into tree
|
# run GNU patch to apply original patch into tree
|
||||||
(ret, out, err) = run_batch("patch --remove-empty-files -p%d < \"%s\"" % (level, patchFile))
|
(ret, out, err) = run_batch("patch --remove-empty-files --no-backup-if-mismatch -p%d < \"%s\"" % (level, patchFile))
|
||||||
|
|
||||||
if ret:
|
if ret:
|
||||||
if out is None and err is None:
|
if out is None and err is None:
|
||||||
|
|||||||
Reference in New Issue
Block a user