diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-05-05 15:27:43 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-05-12 12:26:10 +0000 |
| commit | 9cc12c9cd75ad98d18cbd9c277cd31bf5ed55adf (patch) | |
| tree | 86aa234acdfbaca28394d16c88d2f1fda95f2b96 /morphlib/plugins | |
| parent | 2d19611ace78aec071607fafd0e2798412cc4286 (diff) | |
| download | morph-9cc12c9cd75ad98d18cbd9c277cd31bf5ed55adf.tar.gz | |
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
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/distbuild_plugin.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/morphlib/plugins/distbuild_plugin.py b/morphlib/plugins/distbuild_plugin.py index 71d83dfe..c5ea5ed6 100644 --- a/morphlib/plugins/distbuild_plugin.py +++ b/morphlib/plugins/distbuild_plugin.py @@ -171,17 +171,18 @@ class DistbuildListJobsPlugin(cliapp.Plugin): loop.run() -class SerialiseArtifactPlugin(cliapp.Plugin): +class CalculateBuildGraphPlugin(cliapp.Plugin): def enable(self): - self.app.add_subcommand('serialise-artifact', self.serialise_artifact, + self.app.add_subcommand('calculate-build-graph', + self.calculate_build_graph, arg_synopsis='REPO REF MORPHOLOGY [REF_NAME]') def disable(self): pass - def serialise_artifact(self, args): - '''Internal use only: Serialise Artifact build graph as JSON.''' + def calculate_build_graph(self, args): + '''Internal use only: Encode Artifact build graph as JSON.''' distbuild.add_crash_conditions(self.app.settings['crash-condition']) @@ -202,9 +203,9 @@ class SerialiseArtifactPlugin(cliapp.Plugin): srcpool = build_command.create_source_pool( repo_name, ref, filename, original_ref=original_ref) artifact = build_command.resolve_artifacts(srcpool) - self.app.output.write(distbuild.serialise_artifact(artifact, - repo_name, - ref)) + self.app.output.write(distbuild.encode_artifact(artifact, + repo_name, + ref)) self.app.output.write('\n') @@ -227,8 +228,8 @@ class WorkerBuild(cliapp.Plugin): distbuild.add_crash_conditions(self.app.settings['crash-condition']) - serialized = sys.stdin.readline() - artifact_reference = distbuild.deserialise_artifact(serialized) + text = sys.stdin.readline() + artifact_reference = distbuild.decode_artifact_reference(text) bc = morphlib.buildcommand.BuildCommand(self.app) source_pool = bc.create_source_pool(artifact_reference.repo, |