From 445920189178de0b338fc5fa6f3d52035f58c778 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 31 Mar 2013 01:47:39 +0100 Subject: [PATCH] move orig/rej file removal This needs to be after each patch. Signed-off-by: Johannes Berg --- gentree.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gentree.py b/gentree.py index c766a0af9ecf..06aee47df238 100755 --- a/gentree.py +++ b/gentree.py @@ -232,16 +232,16 @@ def main(): pfilef.write(diff) pfilef.close() os.unlink(fullfn + '.orig_file') + # remove orig/rej files that patch sometimes creates + for root, dirs, files in os.walk(args.outdir): + for f in files: + if f[-5:] == '.orig' or f[-4:] == '.rej': + os.unlink(os.path.join(root, f)) if not printed: print "Not applying changes from %s, not needed" % (os.path.basename(pdir),) else: git_debug_snapshot(args, "apply backport patches from %s" % (os.path.basename(pdir),)) - # remove orig/rej files that patch sometimes creates - for root, dirs, files in os.walk(args.outdir): - for f in files: - if f[-5:] == '.orig' or f[-4:] == '.rej': - os.unlink(os.path.join(root, f)) # rewrite Makefile and source symbols regexes = [] -- 2.30.2