aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLu Wang <coolwanglu@gmail.com>2013-12-14 19:53:45 +0800
committerLu Wang <coolwanglu@gmail.com>2013-12-14 19:53:45 +0800
commit6e40c203ccdbab37acf4ddf3fafaefc5f21992a0 (patch)
tree1bf81564b9a5b932f879bd041cfd7785bc0602bc /tools
parent3b572368961f87f6efbccd2929b5b00bfe814280 (diff)
fnmatch support fullpath
Diffstat (limited to 'tools')
-rw-r--r--tools/file_packager.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/file_packager.py b/tools/file_packager.py
index 0c0f2444..8b8aca8d 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -166,12 +166,12 @@ def has_hidden_attribute(filepath):
# The packager should never preload/embed files if the file is hidden (Win32).
# or it matches any pattern specified in --exclude
-def should_ignore(fullname, filename):
+def should_ignore(fullname):
if has_hidden_attribute(fullname):
return True
for p in excluded_patterns:
- if fnmatch.fnmatch(filename, p):
+ if fnmatch.fnmatch(fullname, p):
return True
return False
@@ -183,7 +183,7 @@ def add(arg, dirname, names):
new_names = []
for name in names:
fullname = os.path.join(dirname, name)
- if should_ignore(fullname, name):
+ if should_ignore(fullname):
if DEBUG:
print >> sys.stderr, 'Skipping file "' + fullname + '" from inclusion in the emscripten virtual file system.'
else:
@@ -196,7 +196,7 @@ def add(arg, dirname, names):
new_data_files = []
for file_ in data_files:
- if not should_ignore(file_['srcpath'], os.path.basename(file_['srcpath'])):
+ if not should_ignore(file_['srcpath']):
if os.path.isdir(file_['srcpath']):
os.path.walk(file_['srcpath'], add, [file_['mode'], file_['srcpath'], file_['dstpath']])
else: