summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2006-03-05 01:58:57 (GMT)
committerSteven Knight <knight@baldmt.com>2006-03-05 01:58:57 (GMT)
commit7357a977659b04aa9079410348ba0a9d7b500f65 (patch)
treedf7ee1d4687bb48567d26611e7f6542b7a532d90
parent6deacf2c5357261c935ade714bf5ec00aff8b358 (diff)
downloadSCons-7357a977659b04aa9079410348ba0a9d7b500f65.zip
SCons-7357a977659b04aa9079410348ba0a9d7b500f65.tar.gz
SCons-7357a977659b04aa9079410348ba0a9d7b500f65.tar.bz2
Remove unnecessary creation of RCS and SCCS Node.Dir nodes.
-rw-r--r--src/engine/SCons/Node/FS.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 36d84db..c0a6186 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -335,8 +335,14 @@ def do_diskcheck_rcs(node, name):
try:
rcs_dir = node.rcs_dir
except AttributeError:
- rcs_dir = node.rcs_dir = node.Dir('RCS')
- return rcs_dir.entry_exists_on_disk(name+',v')
+ if node.entry_exists_on_disk('RCS'):
+ rcs_dir = node.Dir('RCS')
+ else:
+ rcs_dir = None
+ node.rcs_dir = rcs_dir
+ if rcs_dir:
+ return rcs_dir.entry_exists_on_disk(name+',v')
+ return None
def ignore_diskcheck_rcs(node, name):
return None
@@ -345,8 +351,14 @@ def do_diskcheck_sccs(node, name):
try:
sccs_dir = node.sccs_dir
except AttributeError:
- sccs_dir = node.sccs_dir = node.Dir('SCCS')
- return sccs_dir.entry_exists_on_disk('s.'+name)
+ if node.entry_exists_on_disk('SCCS'):
+ sccs_dir = node.Dir('SCCS')
+ else:
+ sccs_dir = None
+ node.sccs_dir = sccs_dir
+ if sccs_dir:
+ return sccs_dir.entry_exists_on_disk('s.'+name)
+ return None
def ignore_diskcheck_sccs(node, name):
return None