summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-01-16 10:13:42 (GMT)
committerSteven Knight <knight@baldmt.com>2003-01-16 10:13:42 (GMT)
commitc62170e2be12536add8df51ecbf414e560d93733 (patch)
tree7c13598eef89788b6a6a1557076610b430d30fb5 /src
parent96dd44b54ee802476e86ad58dcc68a79fd757f9a (diff)
downloadSCons-c62170e2be12536add8df51ecbf414e560d93733.zip
SCons-c62170e2be12536add8df51ecbf414e560d93733.tar.gz
SCons-c62170e2be12536add8df51ecbf414e560d93733.tar.bz2
Fix bug in Clean() functionality. (Steve Leblanc)
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Script/SConscript.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index fcb08cf..29338a6 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -317,19 +317,24 @@ def SetJobs(num):
raise SCons.Errors.UserError, "A positive integer is required: %s"%repr(num)
def Clean(target, files):
- target = str(target)
+ if not isinstance(target, SCons.Node.Node):
+ target = SCons.Node.FS.default_fs.Entry(target, create=1)
+
if not SCons.Util.is_List(files):
files = [files]
+
nodes = []
for f in files:
if isinstance(f, SCons.Node.Node):
nodes.append(f)
else:
nodes.extend(SCons.Node.arg2nodes(f, SCons.Node.FS.default_fs.Entry))
- if clean_targets.has_key(target):
- clean_targets[target].extend(nodes)
+
+ s = str(target)
+ if clean_targets.has_key(s):
+ clean_targets[s].extend(nodes)
else:
- clean_targets[target] = nodes
+ clean_targets[s] = nodes
def BuildDefaultGlobals():
"""