summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-08 09:09:51 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-14 13:28:49 +0000
commit9afaefb4c84ca1623d8eb9766f0d6031d2ed2f83 (patch)
treebfb72a585cbc2b5bd3c49d5d632ef5ceb4393a0e
parentb581801d265154ee94b1bc51eb986e4497b536e4 (diff)
downloadmorph-9afaefb4c84ca1623d8eb9766f0d6031d2ed2f83.tar.gz
show-dependencies: Use sanitise_morphology_path instead of stripping `.morph`
-rw-r--r--morphlib/plugins/show_dependencies_plugin.py4
-rw-r--r--tests/show-dependencies.stdout2
2 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/plugins/show_dependencies_plugin.py b/morphlib/plugins/show_dependencies_plugin.py
index c59cf507..3a1cb7ad 100644
--- a/morphlib/plugins/show_dependencies_plugin.py
+++ b/morphlib/plugins/show_dependencies_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -65,7 +65,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')]
+ morph = morphlib.util.sanitise_morphology_path(filename)
self.app.output.write('dependency graph for %s|%s|%s:\n' %
(repo, ref, morph))
diff --git a/tests/show-dependencies.stdout b/tests/show-dependencies.stdout
index 5d6a6e58..91d289a9 100644
--- a/tests/show-dependencies.stdout
+++ b/tests/show-dependencies.stdout
@@ -1,4 +1,4 @@
-dependency graph for test-repo|master|xfce-system:
+dependency graph for test-repo|master|xfce-system.morph:
test-repo|master|xfce-system.morph|xfce-system-rootfs
-> test-repo|master|xfce-core.morph|xfce-core-devel
-> test-repo|master|xfce-core.morph|xfce-core-runtime