ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'remove-filer-paths' of https://github.com/theotherjimmy/mbed into dev_rollup

pull/8753/head
Martin Kojtal 2018-11-15 13:58:45 +00:00
parent 9a252cd218 b99fd4058b
commit d925d124c9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/resources/__init__.py
View File

@ -372,7 +372,7 @@ class Resources(object):
root_path = join(relpath(root, base_path))
if self._ignoreset.is_ignored(join(root_path,"")):
self.ignore_dir(root_path)
self.ignore_dir(join(into_path, root_path))
dirs[:] = []
continue
@ -385,11 +385,17 @@ class Resources(object):
if (any(self._not_current_label(d, t) for t
in self._labels.keys())):
self._label_paths.append((dir_path, base_path, into_path))
self.ignore_dir(relpath(dir_path, base_path))
self.ignore_dir(join(
into_path,
relpath(dir_path, base_path)
))
dirs.remove(d)
elif (d.startswith('.') or d in self._legacy_ignore_dirs or
self._ignoreset.is_ignored(join(root_path, d, ""))):
self.ignore_dir(relpath(dir_path, base_path))
self.ignore_dir(join(
into_path,
relpath(dir_path, base_path)
))
dirs.remove(d)
# Add root to include paths
@ -443,12 +449,12 @@ class Resources(object):
scanning starting as base_path
"""
fake_path = join(into_path, relpath(file_path, base_path))
if (self._ignoreset.is_ignored(relpath(file_path, base_path)) or
basename(file_path).startswith(".")):
self.ignore_dir(relpath(file_path, base_path))
self.ignore_dir(fake_path)
return
fake_path = join(into_path, relpath(file_path, base_path))
_, ext = splitext(file_path)
file_type = self._EXT.get(ext.lower())