summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-06-15 17:53:27 +0000
committerSteven Knight <knight@baldmt.com>2010-06-15 17:53:27 +0000
commit1bdd31363a68cfe791e84ac6d7fbf2147a3afd36 (patch)
treeba438f3b4b6ca3aeb5358e83904a7a7713e4b027 /src
parentc24d3ebbe70d64a0e3a9663e04e2ecf3333ec961 (diff)
downloadscons-1bdd31363a68cfe791e84ac6d7fbf2147a3afd36.tar.gz
Issue 2647: In Executor.Null.get_all_children(), really return all of
the children, including the explicit dependencies, not just the sources.
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt5
-rw-r--r--src/engine/SCons/Executor.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b30ba5c9..2dda4d15 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -7,9 +7,10 @@
RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
- From John Doe:
+ From Steven Knight:
- - Whatever John Doe did.
+ - Fix explicit dependencies (Depends()) on Nodes that don't have
+ attached Builders.
RELEASE 2.0.0.beta.20100605 - Sat, 05 Jun 2010 21:02:48 -0700
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py
index 07a4ee6a..6f2489b3 100644
--- a/src/engine/SCons/Executor.py
+++ b/src/engine/SCons/Executor.py
@@ -596,7 +596,7 @@ class Null(object):
def get_all_sources(self):
return self.batches[0].targets[0].sources
def get_all_children(self):
- return self.get_all_sources()
+ return self.batches[0].targets[0].children()
def get_all_prerequisites(self):
return []
def get_action_side_effects(self):