summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-01-30 16:25:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-01 15:08:41 (GMT)
commitcf425a13a2283de5483939a9f70b518fb745e9f6 (patch)
tree4daa1d8e8b5a67df52cbcd2b58b69546118a220d /bitbake/bin
parent936aca72c9766908bb021875cc752dc1d7a9cfa7 (diff)
downloadpoky-cf425a13a2283de5483939a9f70b518fb745e9f6.tar.gz
bitbake-layers: use dashes in subcommands
Rather than the slightly awkward underscores, use dashes in subcommands e.g. show-layers instead of show_layers. (The old underscored forms continue to be accepted however.) (Bitbake rev: 6d311ddc1be04ae5bd0a1ebee94b44968e8a3f27) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/bitbake-layers12
1 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index b4cfd55..fd1ebfb 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -38,6 +38,8 @@ def main(args):
38 38
39 cmds = Commands(initialenv) 39 cmds = Commands(initialenv)
40 if args: 40 if args:
41 # Allow user to specify e.g. show-layers instead of show_layers
42 args = [args[0].replace('-', '_')] + args[1:]
41 cmds.onecmd(' '.join(args)) 43 cmds.onecmd(' '.join(args))
42 else: 44 else:
43 cmds.do_help('') 45 cmds.do_help('')
@@ -90,14 +92,14 @@ class Commands(cmd.Cmd):
90 """display general help or help on a specified command""" 92 """display general help or help on a specified command"""
91 if topic: 93 if topic:
92 sys.stdout.write('%s: ' % topic) 94 sys.stdout.write('%s: ' % topic)
93 cmd.Cmd.do_help(self,topic) 95 cmd.Cmd.do_help(self, topic.replace('-', '_'))
94 else: 96 else:
95 sys.stdout.write("usage: bitbake-layers <command> [arguments]\n\n") 97 sys.stdout.write("usage: bitbake-layers <command> [arguments]\n\n")
96 sys.stdout.write("Available commands:\n") 98 sys.stdout.write("Available commands:\n")
97 procnames = self.get_names() 99 procnames = self.get_names()
98 for procname in procnames: 100 for procname in procnames:
99 if procname[:3] == 'do_': 101 if procname[:3] == 'do_':
100 sys.stdout.write(" %s\n" % procname[3:]) 102 sys.stdout.write(" %s\n" % procname[3:].replace('_', '-'))
101 doc = getattr(self, procname).__doc__ 103 doc = getattr(self, procname).__doc__
102 if doc: 104 if doc:
103 sys.stdout.write(" %s\n" % doc.splitlines()[0]) 105 sys.stdout.write(" %s\n" % doc.splitlines()[0])
@@ -123,7 +125,7 @@ class Commands(cmd.Cmd):
123 def do_show_overlayed(self, args): 125 def do_show_overlayed(self, args):
124 """list overlayed recipes (where there is a recipe in another layer that has a higher layer priority) 126 """list overlayed recipes (where there is a recipe in another layer that has a higher layer priority)
125 127
126usage: show_overlayed 128usage: show-overlayed
127 129
128Highest priority recipes are listed with the recipes they overlay as subitems. 130Highest priority recipes are listed with the recipes they overlay as subitems.
129""" 131"""
@@ -194,7 +196,7 @@ build results (as the layer priority order has effectively changed).
194 196
195 for layername in layernames: 197 for layername in layernames:
196 if not layername in found_layernames: 198 if not layername in found_layernames:
197 logger.error('Unable to find layer %s in current configuration, please run "%s show_layers" to list configured layers' % (layername, os.path.basename(sys.argv[0]))) 199 logger.error('Unable to find layer %s in current configuration, please run "%s show-layers" to list configured layers' % (layername, os.path.basename(sys.argv[0])))
198 return 200 return
199 layers = found_layerdirs 201 layers = found_layerdirs
200 else: 202 else:
@@ -313,7 +315,7 @@ build results (as the layer priority order has effectively changed).
313 def do_show_appends(self, args): 315 def do_show_appends(self, args):
314 """list bbappend files and recipe files they apply to 316 """list bbappend files and recipe files they apply to
315 317
316usage: show_appends 318usage: show-appends
317 319
318Recipes are listed with the bbappends that apply to them as subitems. 320Recipes are listed with the bbappends that apply to them as subitems.
319""" 321"""