Subject: [Boost-commit] svn:boost r64463 - in trunk/tools/build/v2: build util
From: ghost_at_[hidden]
Date: 2010-07-30 06:14:15
Author: vladimir_prus
Date: 2010-07-30 06:14:15 EDT (Fri, 30 Jul 2010)
New Revision: 64463
URL: http://svn.boost.org/trac/boost/changeset/64463
Log:
Fix 'glob-in-tree'.
Text files modified:
trunk/tools/build/v2/build/project.py | 2 +-
trunk/tools/build/v2/util/path.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Modified: trunk/tools/build/v2/build/project.py
==============================================================================
--- trunk/tools/build/v2/build/project.py (original)
+++ trunk/tools/build/v2/build/project.py 2010-07-30 06:14:15 EDT (Fri, 30 Jul 2010)
@@ -978,7 +978,7 @@
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")
Modified: trunk/tools/build/v2/util/path.py
==============================================================================
--- trunk/tools/build/v2/util/path.py (original)
+++ trunk/tools/build/v2/util/path.py 2010-07-30 06:14:15 EDT (Fri, 30 Jul 2010)
@@ -848,7 +848,7 @@
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))