diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 14:47:07 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 14:47:07 +0000 |
| commit | b173718435763e3ff9ae090e128da6463d0fead8 (patch) | |
| tree | e35c66b4518f22838952d8b00d36fb87c19abf25 /morphlib/plugins/branch_and_merge_plugin.py | |
| parent | 8f21a1bd9bf4f89583ff32c7c01bc181e34880f4 (diff) | |
| parent | a2468159c731dbcf26dbb6483bcf50b5a81bccd8 (diff) | |
| download | definitions-b173718435763e3ff9ae090e128da6463d0fead8.tar.gz | |
Merge branch 'baserock/richardmaw/S8847/branch-from-image-v3'
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 37d5e40c..2f8560d0 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -68,15 +68,9 @@ class BranchAndMergePlugin(cliapp.Plugin): self.app.add_subcommand('build', self.build, arg_synopsis='SYSTEM') self.app.add_subcommand('old-status', self.status) - self.app.add_subcommand('branch-from-image', self.branch_from_image, - arg_synopsis='REPO BRANCH') - group_branch = 'Branching Options' - self.app.settings.string(['metadata-dir'], - 'Set metadata location for branch-from-image' - ' (default: /baserock)', - metavar='DIR', - default='/baserock', - group=group_branch) + self.app.add_subcommand('old-branch-from-image', + self.branch_from_image, + arg_synopsis='REPO BRANCH') # Advanced commands self.app.add_subcommand('old-foreach', self.foreach, |