diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-11-05 23:08:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-18 14:42:12 +0000 |
commit | 1a33ae9cc768e0b04ffc3e3b416ac8b32acfea4f (patch) | |
tree | ee5d225a4e1a64dff840294917bfb319b1de4ff0 | |
parent | e2e2e4390b88b4503c469daf65c2b5ea401ab28b (diff) | |
download | poky-1a33ae9cc768e0b04ffc3e3b416ac8b32acfea4f.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: 950168bce4ee69b04d7679d9e2d164e2f5c36953)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.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 b944ec3966..aeb9452a8a 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -1895,7 +1895,7 @@ def finish(args, config, basepath, workspace): | |||
1895 | else: | 1895 | else: |
1896 | 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) | 1896 | 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) |
1897 | 1897 | ||
1898 | no_clean = False | 1898 | no_clean = args.no_clean |
1899 | tinfoil = setup_tinfoil(basepath=basepath, tracking=True) | 1899 | tinfoil = setup_tinfoil(basepath=basepath, tracking=True) |
1900 | try: | 1900 | try: |
1901 | rd = parse_recipe(config, tinfoil, args.recipename, True) | 1901 | rd = parse_recipe(config, tinfoil, args.recipename, True) |
@@ -2169,6 +2169,7 @@ def register_commands(subparsers, context): | |||
2169 | 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') | 2169 | 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') |
2170 | parser_finish.add_argument('--initial-rev', help='Override starting revision for patches') | 2170 | parser_finish.add_argument('--initial-rev', help='Override starting revision for patches') |
2171 | parser_finish.add_argument('--force', '-f', action="store_true", help='Force continuing even if there are uncommitted changes in the source tree repository') | 2171 | parser_finish.add_argument('--force', '-f', action="store_true", help='Force continuing even if there are uncommitted changes in the source tree repository') |
2172 | parser_finish.add_argument('--no-clean', '-n', action="store_true", help='Don\'t clean the sysroot to remove recipe output') | ||
2172 | parser_finish.add_argument('--no-overrides', '-O', action="store_true", help='Do not handle other override branches (if they exist)') | 2173 | parser_finish.add_argument('--no-overrides', '-O', action="store_true", help='Do not handle other override branches (if they exist)') |
2173 | parser_finish.add_argument('--dry-run', '-N', action="store_true", help='Dry-run (just report changes instead of writing them)') | 2174 | parser_finish.add_argument('--dry-run', '-N', action="store_true", help='Dry-run (just report changes instead of writing them)') |
2174 | 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)') | 2175 | 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)') |