summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-12-04 20:29:11 +0200
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-12-04 20:29:11 +0200
commitaf6e19eaf28a630067c9877d8d89221d8e33cf2e (patch)
tree000fcb9232d8ee6d640f7c70a9939bc5cac1aaf6
parent17f0e1208f9b87950c1a320d1a39afa142a39c08 (diff)
Support comma-separate patterns for --include too.
Change-Id: Iedebe93890f157ef8a1b79b58577fb5f524ed5ba
-rwxr-xr-xlinaro-cp.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/linaro-cp.py b/linaro-cp.py
index 8944a40..916a4a3 100755
--- a/linaro-cp.py
+++ b/linaro-cp.py
@@ -82,15 +82,14 @@ class API_v1(object):
if not root.endswith(dst): # in sub directory
dst_dir = os.path.join(dst, root[len(src_dir) + 1:])
for f in files:
- # Include all files by default
- skip = False
- for pat in options.include:
- # If there's at least one include pattern, skip unless
- # some pattern matches
- skip = True
- if fnmatch.fnmatch('%s/%s' % (dst_dir, f), "*/" + pat):
- skip = False
- break
+ # If there's at least one include pattern, skip unless
+ # some pattern matches
+ skip = len(options.include) > 0
+ for pat2 in options.include:
+ for pat in pat2.split(","):
+ if fnmatch.fnmatch('%s/%s' % (dst_dir, f), "*/" + pat):
+ skip = False
+ break
if not skip:
dst_file = '%s%s/%s' % (self.api_base, dst_dir, f)
transfer_queue[dst_file] = os.path.join(root, f)