diff options
| author | Richard Maw <richard.maw@gmail.com> | 2014-10-01 22:11:42 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@gmail.com> | 2014-10-08 12:13:56 +0000 |
| commit | 2689f61a305ec576f229f1d9f0929d7eb11d1acc (patch) | |
| tree | 85e4e0259360d8f824b1ee775f0511f939284d50 /morphlib/plugins | |
| parent | f814cf6c4a8cae6b5a28349897626d42f5fd9f9e (diff) | |
| download | morph-2689f61a305ec576f229f1d9f0929d7eb11d1acc.tar.gz | |
Fix issues with distbuild caused by moving to building per-source
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/distbuild_plugin.py | 2 | ||||
| -rw-r--r-- | morphlib/plugins/list_artifacts_plugin.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/morphlib/plugins/distbuild_plugin.py b/morphlib/plugins/distbuild_plugin.py index 26c26498..1858a9ba 100644 --- a/morphlib/plugins/distbuild_plugin.py +++ b/morphlib/plugins/distbuild_plugin.py @@ -103,7 +103,7 @@ class WorkerBuild(cliapp.Plugin): self.app.subcommands['gc']([]) arch = artifact.arch - bc.build_artifact(artifact, bc.new_build_env(arch)) + bc.build_source(artifact.source, bc.new_build_env(arch)) def is_system_artifact(self, filename): return re.match(r'^[0-9a-fA-F]{64}\.system\.', filename) diff --git a/morphlib/plugins/list_artifacts_plugin.py b/morphlib/plugins/list_artifacts_plugin.py index 8074206b..61c8d160 100644 --- a/morphlib/plugins/list_artifacts_plugin.py +++ b/morphlib/plugins/list_artifacts_plugin.py @@ -105,11 +105,13 @@ class ListArtifactsPlugin(cliapp.Plugin): self.app.settings, system_artifact.source.morphology['arch']) ckc = morphlib.cachekeycomputer.CacheKeyComputer(build_env) - artifact_files = set() - for artifact in system_artifact.walk(): + for source in set(a.source for a in system_artifact.walk()): artifact.cache_key = ckc.compute_key(artifact) artifact.cache_id = ckc.get_cache_id(artifact) + artifact_files = set() + for artifact in system_artifact.walk(): + artifact_files.add(artifact.basename()) if artifact.source.morphology.needs_artifact_metadata_cached: |