From 73f5c3170536936da36d3cd4cca7dce01a7614e1 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Tue, 17 Mar 2015 11:26:46 +0000 Subject: fixup: Actually fix the lookups --- distbuild/serialise.py | 2 ++ morphlib/plugins/distbuild_plugin.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/distbuild/serialise.py b/distbuild/serialise.py index d79674b0..d800d487 100644 --- a/distbuild/serialise.py +++ b/distbuild/serialise.py @@ -70,6 +70,7 @@ def serialise_artifact(artifact, repo, ref): 'source_name': source.name, 'source_repo': source.repo_name, 'source_ref': source.original_ref, + 'source_sha1': source.sha1, 'source_artifacts': [], 'dependencies': [] } @@ -108,6 +109,7 @@ def serialise_artifact(artifact, repo, ref): 'source_name': a.source_name, 'source_repo': a.source_repo, 'source_ref': a.source_ref, + 'source_sha1': a.source_sha1, 'source_artifacts': [], 'dependencies': [] } diff --git a/morphlib/plugins/distbuild_plugin.py b/morphlib/plugins/distbuild_plugin.py index 9e2f9f4b..d30e034a 100644 --- a/morphlib/plugins/distbuild_plugin.py +++ b/morphlib/plugins/distbuild_plugin.py @@ -128,6 +128,11 @@ class WorkerBuild(cliapp.Plugin): artifact_reference.filename): if s.cache_key == artifact_reference.cache_key: return s + for s in source_pool.lookup(artifact_reference.source_repo, + artifact_reference.source_sha1, + artifact_reference.filename): + if s.cache_key == artifact_reference.cache_key: + return s def is_system_artifact(self, filename): return re.match(r'^[0-9a-fA-F]{64}\.system\.', filename) -- cgit v1.2.1