summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-03-06 13:36:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-10 04:36:52 +0000
commit365eb9b5d22208c967dcd91d8ab52faed20f04b5 (patch)
tree62adc7fa96ef5ed9a0f4354155603afb496a76a3
parent0aad8decf0eb17b90153225493f28835d24f043a (diff)
downloadpoky-365eb9b5d22208c967dcd91d8ab52faed20f04b5.tar.gz
bitbake: bitbake-layers: fix duplicated help info
There are two "help" lines when run bitbake help under python 2.6.6 (perhaps all python 2.6): $ bitbake-layers help [snip] help display general help or help on a specified command [snip] help display general help or help on a specified command This is because the cmd.py in python 2.6.6 also has a do_help() function as our bitbake-layers, and the cmd.Cmd.get_names() doesn't consider the overload, this has been fixed in python 2.7, use set() to remove the duplicated would fix the problem. [YOCTO #3428] (Bitbake rev: 324ed96e28ec31cff8cef1824d20d40f9a5d46ad) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake-layers2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index b48590f936..86da2689e6 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -73,7 +73,7 @@ class Commands(cmd.Cmd):
73 else: 73 else:
74 sys.stdout.write("usage: bitbake-layers <command> [arguments]\n\n") 74 sys.stdout.write("usage: bitbake-layers <command> [arguments]\n\n")
75 sys.stdout.write("Available commands:\n") 75 sys.stdout.write("Available commands:\n")
76 procnames = self.get_names() 76 procnames = list(set(self.get_names()))
77 for procname in procnames: 77 for procname in procnames:
78 if procname[:3] == 'do_': 78 if procname[:3] == 'do_':
79 sys.stdout.write(" %s\n" % procname[3:].replace('_', '-')) 79 sys.stdout.write(" %s\n" % procname[3:].replace('_', '-'))