diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-09-20 22:30:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-27 13:02:17 +0100 |
commit | 5af64b55f3f1066488056d8c052ebc1561834b4a (patch) | |
tree | 6c847fde1d7218454ebad1374311835540f349bf | |
parent | a70e1fdba262b4787b03624eacb9ae59bd84931c (diff) | |
download | poky-5af64b55f3f1066488056d8c052ebc1561834b4a.tar.gz |
devtool: finish: Add suppport for the --no-clean option
This works just like the already existing --no-clean option to the
`devtool reset` command.
(From OE-Core rev: 4433d3133ce53cdf7db17f5e7914fe8c4d78dba3)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/devtool/standard.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 64fa420bf1..60c9a046f9 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -2008,7 +2008,7 @@ def finish(args, config, basepath, workspace): | |||
2008 | else: | 2008 | else: |
2009 | raise DevtoolError('Source tree is not clean:\n\n%s\nEnsure you have committed your changes or use -f/--force if you are sure there\'s nothing that needs to be committed' % dirty) | 2009 | raise DevtoolError('Source tree is not clean:\n\n%s\nEnsure you have committed your changes or use -f/--force if you are sure there\'s nothing that needs to be committed' % dirty) |
2010 | 2010 | ||
2011 | no_clean = False | 2011 | no_clean = args.no_clean |
2012 | tinfoil = setup_tinfoil(basepath=basepath, tracking=True) | 2012 | tinfoil = setup_tinfoil(basepath=basepath, tracking=True) |
2013 | try: | 2013 | try: |
2014 | rd = parse_recipe(config, tinfoil, args.recipename, True) | 2014 | rd = parse_recipe(config, tinfoil, args.recipename, True) |
@@ -2282,6 +2282,7 @@ def register_commands(subparsers, context): | |||
2282 | parser_finish.add_argument('--mode', '-m', choices=['patch', 'srcrev', 'auto'], default='auto', help='Update mode (where %(metavar)s is %(choices)s; default is %(default)s)', metavar='MODE') | 2282 | parser_finish.add_argument('--mode', '-m', choices=['patch', 'srcrev', 'auto'], default='auto', help='Update mode (where %(metavar)s is %(choices)s; default is %(default)s)', metavar='MODE') |
2283 | parser_finish.add_argument('--initial-rev', help='Override starting revision for patches') | 2283 | parser_finish.add_argument('--initial-rev', help='Override starting revision for patches') |
2284 | parser_finish.add_argument('--force', '-f', action="store_true", help='Force continuing even if there are uncommitted changes in the source tree repository') | 2284 | parser_finish.add_argument('--force', '-f', action="store_true", help='Force continuing even if there are uncommitted changes in the source tree repository') |
2285 | parser_finish.add_argument('--no-clean', '-n', action="store_true", help='Don\'t clean the sysroot to remove recipe output') | ||
2285 | parser_finish.add_argument('--no-overrides', '-O', action="store_true", help='Do not handle other override branches (if they exist)') | 2286 | parser_finish.add_argument('--no-overrides', '-O', action="store_true", help='Do not handle other override branches (if they exist)') |
2286 | parser_finish.add_argument('--dry-run', '-N', action="store_true", help='Dry-run (just report changes instead of writing them)') | 2287 | parser_finish.add_argument('--dry-run', '-N', action="store_true", help='Dry-run (just report changes instead of writing them)') |
2287 | parser_finish.add_argument('--force-patch-refresh', action="store_true", help='Update patches in the layer even if they have not been modified (useful for refreshing patch context)') | 2288 | parser_finish.add_argument('--force-patch-refresh', action="store_true", help='Update patches in the layer even if they have not been modified (useful for refreshing patch context)') |