This should have been register_commands rather than register_command; I used register_commands in devtool so lets change this here to be consistent with that. (Since this is extensible through layers though we need to remain compatible with the old name, so fall back to that if the new function name isn't there.)
Signed-off-by: Paul Eggleton <[email protected]> --- scripts/lib/recipetool/append.py | 2 +- scripts/lib/recipetool/create.py | 2 +- scripts/lib/recipetool/newappend.py | 2 +- scripts/lib/recipetool/setvar.py | 2 +- scripts/recipetool | 6 +++++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index 7fe4115..fc2008c 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py @@ -433,7 +433,7 @@ def target_path(targetpath): return targetpath -def register_command(subparsers): +def register_commands(subparsers): common = argparse.ArgumentParser(add_help=False) common.add_argument('-m', '--machine', help='Make bbappend changes specific to a machine only', metavar='MACHINE') common.add_argument('-w', '--wildcard-version', help='Use wildcard to make the bbappend apply to any recipe version', action='store_true') diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 15aa9bd..2d75046 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -436,7 +436,7 @@ def convert_debian(debpath): return values -def register_command(subparsers): +def register_commands(subparsers): parser_create = subparsers.add_parser('create', help='Create a new recipe', description='Creates a new recipe from a source tree') diff --git a/scripts/lib/recipetool/newappend.py b/scripts/lib/recipetool/newappend.py index 4eeac0e..f9b8d85 100644 --- a/scripts/lib/recipetool/newappend.py +++ b/scripts/lib/recipetool/newappend.py @@ -97,7 +97,7 @@ def newappend(args): print(append_path) -def register_command(subparsers): +def register_commands(subparsers): parser = subparsers.add_parser('newappend', help='Create a bbappend for the specified target in the specified layer') parser.add_argument('-w', '--wildcard-version', help='Use wildcard to make the bbappend apply to any recipe version', action='store_true') diff --git a/scripts/lib/recipetool/setvar.py b/scripts/lib/recipetool/setvar.py index 18e3281..657d2b6 100644 --- a/scripts/lib/recipetool/setvar.py +++ b/scripts/lib/recipetool/setvar.py @@ -62,7 +62,7 @@ def setvar(args): return 0 -def register_command(subparsers): +def register_commands(subparsers): parser_setvar = subparsers.add_parser('setvar', help='Set a variable within a recipe', description='Adds/updates the value a variable is set to in a recipe') diff --git a/scripts/recipetool b/scripts/recipetool index 4af0bfb..791a66a 100755 --- a/scripts/recipetool +++ b/scripts/recipetool @@ -82,7 +82,11 @@ def main(): registered = False for plugin in plugins: - if hasattr(plugin, 'register_command'): + if hasattr(plugin, 'register_commands'): + registered = True + plugin.register_commands(subparsers) + elif hasattr(plugin, 'register_command'): + # Legacy function name registered = True plugin.register_command(subparsers) if hasattr(plugin, 'tinfoil_init'): -- 2.1.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
