diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-08 09:09:51 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-08 15:22:49 +0000 |
| commit | ea68fab0fb80c7e666e01c85d3b19acd09e36273 (patch) | |
| tree | 4f8a53759572a0d73a9d94e67e83037b418c6085 | |
| parent | f6b4aeaab8320c20e6c5a8f4ca519c0795f88540 (diff) | |
| download | morph-ea68fab0fb80c7e666e01c85d3b19acd09e36273.tar.gz | |
show-dependencies: Use sanitise_morphology_path instead of appending `.morph`
| -rw-r--r-- | morphlib/plugins/show_dependencies_plugin.py | 4 | ||||
| -rw-r--r-- | tests/show-dependencies.stdout | 2 |
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 |