mirror of
https://github.com/boostorg/build.git
synced 2026-02-18 01:52:17 +00:00
Fix 'glob-in-tree'.
[SVN r64463]
This commit is contained in:
@@ -978,7 +978,7 @@ attribute is allowed only for top-level 'project' invocations""")
|
||||
bad = 1
|
||||
|
||||
if bad:
|
||||
self.registry.manager().errors()(
|
||||
self.registry.manager.errors()(
|
||||
"The patterns to 'glob-tree' may not include directory")
|
||||
return self.registry.glob_internal(self.registry.current(),
|
||||
wildcards, excludes, "glob_tree")
|
||||
|
||||
@@ -848,7 +848,7 @@ def glob_tree(roots, patterns, exclude_patterns=None):
|
||||
exclude_patterns = []
|
||||
|
||||
result = glob(roots, patterns, exclude_patterns)
|
||||
subdirs = [s for s in result if s != "." and s != ".." and os.path.isdir(s)]
|
||||
subdirs = [s for s in glob(roots, ["*"]) if s != "." and s != ".." and os.path.isdir(s)]
|
||||
if subdirs:
|
||||
result.extend(glob_tree(subdirs, patterns, exclude_patterns))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user