diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-30 12:19:48 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-30 12:19:48 +0100 |
commit | 83e9ac29d9092bd1e0f66ffe6465d86f9396d5ea (patch) | |
tree | 67f15d5fe4c015876dcc6c40d902ea0b7d0221f5 | |
parent | 00f27bffd7d180417461c6a8952cad8944997f0a (diff) | |
parent | 2e33d30c2b4dabff006128391135cc595866c483 (diff) | |
download | morph-83e9ac29d9092bd1e0f66ffe6465d86f9396d5ea.tar.gz |
Merge branch 'baserock/richardmaw/conficting-strata'
Reviewed-by: Lars Wirzenius
-rw-r--r-- | morphlib/buildcommand.py | 11 |
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: |