summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-05-30 13:11:47 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-05-30 13:11:47 +0000
commite53c873dd7b28d3837da379840887fd20a9a8b8c (patch)
treee7ae20d24c911aa63da926efab3d5e4d9498cda5
parent34e23e8ae0dd5581e582df542f43e36d8198bcfc (diff)
parent83e9ac29d9092bd1e0f66ffe6465d86f9396d5ea (diff)
downloaddefinitions-e53c873dd7b28d3837da379840887fd20a9a8b8c.tar.gz
Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph
-rw-r--r--morphlib/buildcommand.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index d49f9e72..5be216e1 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -126,9 +126,14 @@ class BuildCommand(object):
logging.warning('No %s' % method_name)
# Verify stratum build-depends agree with the system's contents.
- # It's not an error to build-depend on a stratum that isn't
- # included in the target system, but if it is included, the repo
- # and ref fields must match.
+ # It is permissible for a stratum to build-depend on a stratum that
+ # isn't specified in the target system morphology.
+ # Multiple references to the same stratum are permitted. This is
+ # handled by the SourcePool deduplicating added Sources.
+ # It is forbidden to have two different strata with the same name.
+ # Hence if a Stratum is defined in the System, and in a Stratum as
+ # a build-dependency, then they must both have the same Repository
+ # and Ref specified.
if src.morphology['kind'] == 'stratum':
name = src.morphology['name']
if name in stratum_names: