From 3dc83847b8f17793bdab5e978d13d394b48987b0 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 17 Jun 2014 16:36:07 +0000 Subject: Use exact filenames to refer to morphology files Rather than repeatedly stripping and appending an optional .morph extension morphology names, instead always use the file path of the morphology relative to the definitions repository. This is an inversion of the previous logic, which would strip the .morph extension and use the "name" internally. The exception to this rule of always using the filename, is that `morph edit CHUNK` uses the name of the morphology as-defined in the stratum. This is based off Adam Coldrick's inital patch, but this version will allow the old style of providing the "name" by converting it into a path if it does not have either a / or a . in it. An unfortunate consequence of this change is that the show-dependencies command's output changed, so the test needed updating. --- morphlib/plugins/cross-bootstrap_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'morphlib/plugins/cross-bootstrap_plugin.py') diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py index bfd0d047..cd8e355e 100644 --- a/morphlib/plugins/cross-bootstrap_plugin.py +++ b/morphlib/plugins/cross-bootstrap_plugin.py @@ -260,7 +260,7 @@ class CrossBootstrapPlugin(cliapp.Plugin): self.app.settings, arch) build_command = morphlib.buildcommand.BuildCommand(self.app, build_env) - morph_name = system_name + '.morph' + morph_name = morphlib.util.sanitise_morphology_path(system_name) builds_artifacts = [system_name + '-bootstrap-rootfs'] srcpool = build_command.create_source_pool(root_repo, ref, morph_name) -- cgit v1.2.1