diff options
Diffstat (limited to 'morphlib/sourceresolver.py')
| -rw-r--r-- | morphlib/sourceresolver.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index 5d04ece9..16a254f4 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -329,7 +329,7 @@ class SourceResolver(object): # Morph code doesn't need to know about the predefined # build instructions. chunk_filename = c['name'] + '.morph' - chunk_queue.add((c["name"], c['repo'], c['ref'], + chunk_queue.add((c['name'], c['repo'], c['ref'], chunk_filename, c['build-system'])) return chunk_queue @@ -376,7 +376,7 @@ class SourceResolver(object): predefined_split_rules) def traverse_morphs(self, definitions_repo, definitions_ref, - system_filenames, + system_filenames, pool, visit=lambda rn, rf, fn, arf, m: None, definitions_original_ref=None): @@ -403,6 +403,7 @@ class SourceResolver(object): definitions_version = self._check_version_file( definitions_checkout_dir) + pool.definitions_version = definitions_version predefined_build_systems, predefined_split_rules = \ self._get_defaults( @@ -428,6 +429,7 @@ class SourceResolver(object): visit, predefined_build_systems, predefined_split_rules) + class DuplicateChunkError(morphlib.Error): def _make_msg(self, (name, sources)): # pragma: no cover @@ -503,7 +505,7 @@ def create_source_pool(repo_cache, repo, ref, filenames, resolver = SourceResolver(repo_cache, tree_cache_manager, status_cb) resolver.traverse_morphs(repo, ref, filenames, - visit=add_to_pool, + pool, visit=add_to_pool, definitions_original_ref=original_ref) # No two chunks may have the same name |