Show More
@@ -241,9 +241,6 b' def patch(patchname, ui, strip=1, cwd=No' | |||||
241 | fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, |
|
241 | fp = os.popen('%s %s -p%d < %s' % (patcher, ' '.join(args), strip, | |
242 | util.shellquote(patchname))) |
|
242 | util.shellquote(patchname))) | |
243 |
|
243 | |||
244 | if dopatch == 'filter': |
|
|||
245 | False and os.unlink(patchname) |
|
|||
246 |
|
||||
247 | for line in fp: |
|
244 | for line in fp: | |
248 | line = line.rstrip() |
|
245 | line = line.rstrip() | |
249 | ui.note(line + '\n') |
|
246 | ui.note(line + '\n') | |
@@ -265,6 +262,9 b' def patch(patchname, ui, strip=1, cwd=No' | |||||
265 | printed_file = True |
|
262 | printed_file = True | |
266 | ui.warn(line + '\n') |
|
263 | ui.warn(line + '\n') | |
267 |
|
264 | |||
|
265 | if dopatch == 'filter': | |||
|
266 | os.unlink(patchname) | |||
|
267 | ||||
268 | code = fp.close() |
|
268 | code = fp.close() | |
269 | if code: |
|
269 | if code: | |
270 | raise util.Abort(_("patch command failed: %s") % |
|
270 | raise util.Abort(_("patch command failed: %s") % |
General Comments 0
You need to be logged in to leave comments.
Login now