diff options
| author | maruel <maruel@chromium.org> | 2014-09-17 11:59:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 18:59:59 +0000 |
| commit | 17e5a85d71ba5ca09fe66ac4c1b0e4e7262db9bd (patch) | |
| tree | abd2eab8fe5f51da64c7f047341025945391c24f /tools/isolate_driver.py | |
| parent | 035a7945ae0e91709479b824e03a8903e2ed2af1 (diff) | |
| download | chromium_src-17e5a85d71ba5ca09fe66ac4c1b0e4e7262db9bd.zip chromium_src-17e5a85d71ba5ca09fe66ac4c1b0e4e7262db9bd.tar.gz chromium_src-17e5a85d71ba5ca09fe66ac4c1b0e4e7262db9bd.tar.bz2 | |
Fix a bug in isolate_driver.py where it would map directories.
This would cause <(PRODUCT_DIR)/remoting/remoting.webapp to be mapped, while it
should have been <(PRODUCT_DIR)/remoting/remoting.webapp/. In any case, it's not
useful for isolate_driver.py to map directories, so skip these entries
completely.
R=vadimsh@chromium.org
BUG=
Review URL: https://codereview.chromium.org/581713002
Cr-Commit-Position: refs/heads/master@{#295313}
Diffstat (limited to 'tools/isolate_driver.py')
| -rwxr-xr-x | tools/isolate_driver.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py index 73ad0d6..40f0c6d 100755 --- a/tools/isolate_driver.py +++ b/tools/isolate_driver.py @@ -176,11 +176,13 @@ def post_process_deps(build_dir, dependencies): return i[:-4] return i - # Check for execute access. This gets rid of all the phony rules. - return [ - i for i in map(filter_item, dependencies) - if os.access(os.path.join(build_dir, i), os.X_OK) - ] + def f(i): + # Check for execute access and strip directories. This gets rid of all the + # phony rules. + p = os.path.join(build_dir, i) + return os.access(p, os.X_OK) and not os.path.isdir(p) + + return filter(f, map(filter_item, dependencies)) def create_wrapper(args, isolate_index, isolated_index): |