gentree: only apply .patch files
authorJohannes Berg <johannes.berg@intel.com>
Fri, 5 Apr 2013 23:10:33 +0000 (01:10 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 5 Apr 2013 23:10:33 +0000 (01:10 +0200)
This helps not have to ignore any other random
editor backup files etc.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
gentree.py

index 64dbe3afc83809e78ae98bf99c5a84c1dbae1439..fc36c9033fa9eb293d06da65b0540812aa17571b 100755 (executable)
@@ -338,15 +338,14 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
     logwrite('Apply patches ...')
     patchdirs = []
     for root, dirs, files in os.walk(os.path.join(source_dir, 'patches')):
-        if not dirs:
-            patchdirs.append(root)
+        patchdirs.append(root)
     patchdirs.sort()
     for pdir in patchdirs:
         l = os.listdir(pdir)
         printed = False
         for pfile in l:
-            # FIXME: again, use .gitignore?
-            if pfile[-1] == '~':
+            # only take .patch files
+            if pfile[-6:] != '.patch':
                 continue
             pfile = os.path.join(pdir, pfile)
             # read the patch file