diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-11 18:25:38 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-12 14:13:43 +0100 |
commit | dd21e646b320a4aeb948830034dea2ab94e32064 (patch) | |
tree | c54b72751eed3ab21e1c371d622f24c88e7745f1 /morphlib | |
parent | 4e37fdf5adbf4d25561b472b4089b6782c599f93 (diff) | |
download | morph-dd21e646b320a4aeb948830034dea2ab94e32064.tar.gz |
Don't use .morph extension when printing name of triplets
We should now be fully consistent regarding the form of triplets (ie.
the last component is always a morphology name rather than a filename)
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/plugins/show_dependencies_plugin.py | 5 | ||||
-rw-r--r-- | morphlib/source.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/plugins/show_dependencies_plugin.py b/morphlib/plugins/show_dependencies_plugin.py index e214a92f..8d805a35 100644 --- a/morphlib/plugins/show_dependencies_plugin.py +++ b/morphlib/plugins/show_dependencies_plugin.py @@ -49,6 +49,7 @@ class ShowDependenciesPlugin(cliapp.Plugin): # traverse the morphs to list all the sources for repo, ref, filename in self.app.itertriplets(args): + morph = filename[:-len('.morph')] pool = self.app.create_source_pool( lrc, rrc, (repo, ref, filename)) @@ -56,7 +57,7 @@ class ShowDependenciesPlugin(cliapp.Plugin): artifacts = resolver.resolve_artifacts(pool) self.app.output.write('dependency graph for %s|%s|%s:\n' % - (repo, ref, filename)) + (repo, ref, morph)) for artifact in sorted(artifacts, key=str): self.app.output.write(' %s\n' % artifact) for dependency in sorted(artifact.dependencies, key=str): @@ -64,7 +65,7 @@ class ShowDependenciesPlugin(cliapp.Plugin): order = morphlib.buildorder.BuildOrder(artifacts) self.app.output.write('build order for %s|%s|%s:\n' % - (repo, ref, filename)) + (repo, ref, morph)) for group in order.groups: self.app.output.write(' group:\n') for artifact in group: diff --git a/morphlib/source.py b/morphlib/source.py index ed62ea4a..d4f1e119 100644 --- a/morphlib/source.py +++ b/morphlib/source.py @@ -51,4 +51,4 @@ class Source(object): def __str__(self): # pragma: no cover return '%s|%s|%s' % (self.repo_name, self.original_ref, - self.filename) + self.filename[:-len('.morph')]) |