Merge remote-tracking branch 'origin/sam/validation-fixes'

Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>

1 files changed, 4 insertions, 8 deletions

diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index 2aec5e08..7eb6c0ab 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -184,7 +184,7 @@ class BuildCommand(object):
     def _validate_cross_morphology_references(self, srcpool):
         '''Perform validation across all morphologies involved in the build'''
 
-        stratum_names = []
+        stratum_names = {}
 
         for src in srcpool:
             kind = src.morphology['kind']
@@ -208,15 +208,11 @@ class BuildCommand(object):
             # and Ref specified.
             if src.morphology['kind'] == 'stratum':
                 name = src.name
-                ref = src.sha1[:7]
-                self.app.status(msg='Stratum [%(name)s] version is %(ref)s',
-                                name=name, ref=ref)
                 if name in stratum_names:
                     raise morphlib.Error(
-                        "Conflicting versions of stratum '%s' appear in the "
-                        "build. Check the contents of the system against the "
-                        "build-depends of the strata." % name)
-                stratum_names.append(name)
+                        "Multiple strata produce a '%s' artifact: %s and %s" %
+                        (name, stratum_names[name].filename, src.filename))
+                stratum_names[name] = src
 
     def _validate_cross_refs_for_system(self, src, srcpool):
         self._validate_cross_refs_for_xxx(