Merge branch 'baserock/richardmaw-os/tidy-build-logic-v7'

Reviewed-by: Lars Wirzenius (+2 to misc fixups)
Reviewed-by: Sam Thursfield (+1 to per-source building)
Reviewed-by: Paul Sherwood  (+1 to per-source building)

1 files changed, 5 insertions, 3 deletions

diff --git a/morphlib/app.py b/morphlib/app.py
index 48de6aba..9ab102b3 100644
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -294,9 +294,11 @@ class Morph(cliapp.Application):
         pool = morphlib.sourcepool.SourcePool()
 
         def add_to_pool(reponame, ref, filename, absref, tree, morphology):
-            source = morphlib.source.Source(reponame, ref, absref, tree,
-                                            morphology, filename)
-            pool.add(source)
+            sources = morphlib.source.make_sources(reponame, ref,
+                                                   filename, absref,
+                                                   tree, morphology)
+            for source in sources:
+                pool.add(source)
 
         self.traverse_morphs(repo, ref, [filename], lrc, rrc,
                              update=not self.settings['no-git-update'],