future port
This commit is contained in:
+2
-2
@@ -492,12 +492,12 @@ def do_patch(sourceDir, patchFile, level = 0):
|
|||||||
if not os.path.exists(patchesDir):
|
if not os.path.exists(patchesDir):
|
||||||
os.makedirs(patchesDir)
|
os.makedirs(patchesDir)
|
||||||
# Import original patch into quilt tree
|
# Import original patch into quilt tree
|
||||||
(ret, out, err) = run_batch('quilt import -p %d -n %s %s' % (level, os.path.basename(patchFile), patchFile))
|
(ret, out, err) = run_batch('quilt import -p %d -n %s \"%s\"' % (level, os.path.basename(patchFile), patchFile))
|
||||||
# run quilt push to apply original patch into tree
|
# run quilt push to apply original patch into tree
|
||||||
(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 -p%d < %s" %
|
(ret, out, err) = run_batch("patch -p%d < \"%s\"" %
|
||||||
(level, patchFile))
|
(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