summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Scanner/__init__.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-03-05 08:51:01 (GMT)
committerSteven Knight <knight@baldmt.com>2004-03-05 08:51:01 (GMT)
commitbb42c27bfa1a4208fc3cdc7b583b8093305fc4c0 (patch)
tree40bbe3ce2769d5fc3c9b201a13a59f5c6ebf12e7 /src/engine/SCons/Scanner/__init__.py
parentc6a5a383c8771988bc829ef90111afc4db03cc5f (diff)
downloadSCons-bb42c27bfa1a4208fc3cdc7b583b8093305fc4c0.zip
SCons-bb42c27bfa1a4208fc3cdc7b583b8093305fc4c0.tar.gz
SCons-bb42c27bfa1a4208fc3cdc7b583b8093305fc4c0.tar.bz2
Refactor path-substitution logic into an Environment method.
Diffstat (limited to 'src/engine/SCons/Scanner/__init__.py')
-rw-r--r--src/engine/SCons/Scanner/__init__.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index 4bf8b6c..dc9abc3 100644
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -55,15 +55,7 @@ class FindPathDirs:
except KeyError:
return ()
- if not SCons.Util.is_List(path):
- path = [path]
- r = []
- for p in path:
- if SCons.Util.is_String(p):
- p = env.subst(p)
- r.append(p)
-
- return tuple(self.fs.Rsearchall(r,
+ return tuple(self.fs.Rsearchall(env.subst_path(path),
must_exist = 0,
clazz = SCons.Node.FS.Dir,
cwd = dir))