From 2d389b89ffac18e2f59d7dafc4ed67237cd33d8c Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 30 Mar 2013 23:48:43 +0100
Subject: [PATCH] remove orig/rej files after patching

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 gentree.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gentree.py b/gentree.py
index ec2350619d4b..3fc050c48e15 100755
--- a/gentree.py
+++ b/gentree.py
@@ -215,6 +215,12 @@ def main():
         if not printed:
             print "Not applying changes from %s, not needed" % (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))
+
     git_debug_snapshot(args, "apply backport patches")
 
     # rewrite Makefile and source symbols
-- 
2.30.2