diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-11-23 17:07:24 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-11-25 14:29:09 +0000 |
commit | 13fa0d15645e2d21c9c41d1f6c481233e24a8cfd (patch) | |
tree | 93e3c93f35fe56c1c355c417ef022f48e7a77bf9 /morphlib/plugins/build_plugin.py | |
parent | 25617bd6277e2ec44c8d6acd742280a2708a6a2c (diff) | |
download | morph-13fa0d15645e2d21c9c41d1f6c481233e24a8cfd.tar.gz |
Prepare the removal of workspace and system branches code
Change-Id: Id470c7a77a47c89118a5d9d0d23b2206d8a839e4
Diffstat (limited to 'morphlib/plugins/build_plugin.py')
-rw-r--r-- | morphlib/plugins/build_plugin.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py index 226a2c85..0da5d7cf 100644 --- a/morphlib/plugins/build_plugin.py +++ b/morphlib/plugins/build_plugin.py @@ -55,7 +55,7 @@ class BuildPlugin(cliapp.Plugin): return 'usage: morph %s %s' % (cmd, self.app.cmd_synopsis[cmd]) def distbuild_morphology(self, args): - '''Distbuild a system, outside of a system branch. + '''Distbuild a system without having to clone a definitions repo. Command line arguments: @@ -80,7 +80,7 @@ class BuildPlugin(cliapp.Plugin): self._distbuild(repo, ref, filename, component_names=component_names) def distbuild(self, args): - '''Distbuild a system image in the current system branch + '''Distbuild a system image in the current definitions repo Command line arguments: @@ -114,7 +114,7 @@ class BuildPlugin(cliapp.Plugin): raise cliapp.AppException(self._cmd_usage('distbuild')) definitions_repo = morphlib.definitions_repo.open( - '.', search_for_root=True, search_workspace=True, app=self.app) + '.', search_for_root=True, app=self.app) filename = args[0] filename = morphlib.util.sanitise_morphology_path(filename) @@ -180,7 +180,7 @@ class BuildPlugin(cliapp.Plugin): component_names=component_names) def build_morphology(self, args): - '''Build a system, outside of a system branch. + '''Build a system without having to clone a definitions repo. Command line arguments: @@ -190,11 +190,6 @@ class BuildPlugin(cliapp.Plugin): * `COMPONENT...` is the names of one or more chunks or strata to build. If none are given then the system at FILENAME is built. - You probably want `morph build` instead. However, in some - cases it is more convenient to not have to create a Morph - workspace and check out the relevant system branch, and only - just run the build. For those times, this command exists. - This subcommand does not automatically commit changes to a temporary branch, so you can only build from properly committed sources that have been pushed to the git server. @@ -272,7 +267,7 @@ class BuildPlugin(cliapp.Plugin): raise cliapp.AppException(self._cmd_usage('build')) definitions_repo = morphlib.definitions_repo.open( - '.', search_for_root=True, search_workspace=True, app=self.app) + '.', search_for_root=True, app=self.app) filename = args[0] filename = morphlib.util.sanitise_morphology_path(filename) |