summaryrefslogtreecommitdiff
path: root/gentree.py
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-06 01:10:33 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-04-06 01:10:33 +0200
commitbc1cf7cea4d747c7dae84baf970dd8465ebdc357 (patch)
tree4201357dee2a6ddb2ca663223684004d04c9f9ce /gentree.py
parent3ee5050684013c5f8dab210cc89227db369f46dc (diff)
gentree: only apply .patch files
This helps not have to ignore any other random editor backup files etc. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'gentree.py')
-rwxr-xr-xgentree.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/gentree.py b/gentree.py
index 64dbe3af..fc36c903 100755
--- a/gentree.py
+++ b/gentree.py
@@ -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