From 9cc12c9cd75ad98d18cbd9c277cd31bf5ed55adf Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Tue, 5 May 2015 15:27:43 +0000 Subject: Clean up artifact serialisation We no longer serialise whole artifacts, so it doesn't make sense for things to still refer to serialise-artifact and similar. Change-Id: Id4d563a07041bbce77f13ac71dc3f7de39df5e23 --- distbuild/worker_build_scheduler.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'distbuild/worker_build_scheduler.py') diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py index 71e1c3ef..9397d5c9 100644 --- a/distbuild/worker_build_scheduler.py +++ b/distbuild/worker_build_scheduler.py @@ -527,9 +527,7 @@ class WorkerConnection(distbuild.StateMachine): msg = distbuild.message('exec-request', id=job.artifact.basename(), argv=argv, - stdin_contents=distbuild.serialise_artifact(job.artifact, - job.artifact.repo, - job.artifact.ref), + stdin_contents=distbuild.encode_artifact_reference(job.artifact), ) self._jm.send(msg) @@ -610,9 +608,9 @@ class WorkerConnection(distbuild.StateMachine): kind = job.artifact.kind if kind == 'chunk': - source_artifacts = job.artifact.source_artifacts + artifact_names = job.artifact.source_artifact_names - suffixes = ['%s.%s' % (kind, name) for name in source_artifacts] + suffixes = ['%s.%s' % (kind, name) for name in artifact_names] suffixes.append('build-log') else: filename = '%s.%s' % (kind, job.artifact.name) -- cgit v1.2.1