summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Finney <grahamfinney@codethink.com>2015-04-01 09:17:54 +0000
committerGraham Finney <grahamfinney@codethink.com>2015-04-01 09:17:54 +0000
commit2bc8a5c93e6d1898041b791229f77ea798404d86 (patch)
tree5b63608f58aecf9afafa06c695bc089792eec65c
parenta5320294016646d64dc87007b9976bd995c2846a (diff)
downloadybd-pull/11/master.tar.gz
In non-bootstrap mode, we need to recurse and install all sub-componentspull/11/master
-rw-r--r--sandbox.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/sandbox.py b/sandbox.py
index 188e889..83ec6ec 100644
--- a/sandbox.py
+++ b/sandbox.py
@@ -83,13 +83,16 @@ def remove(this):
def install(this, component, permit_bootstrap=True):
component = Definitions().get(component)
+
for subcomponent in component.get('contents', []):
- install_artifact(this, subcomponent, False)
+ if component.get('build-mode') == 'bootstrap':
+ continue
+ install(this, subcomponent, False)
+
for dependency in component.get('build-depends', []):
install(this, dependency, False)
install_artifact(this, component, permit_bootstrap)
-
def install_artifact(this, component, permit_bootstrap=True):
component = Definitions().get(component)
if component.get('build-mode') == 'bootstrap' and permit_bootstrap == False: