diff options
author | Julien Stephan <jstephan@baylibre.com> | 2023-11-22 12:08:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-30 08:43:04 +0000 |
commit | fcff0674078daeb64a251c1f5888d651ee67447c (patch) | |
tree | d6709b83e96700093a81cdff42f983ffac7b37f0 /scripts/lib | |
parent | fad57568924b689de4aba5c3cf74d6828a08e23f (diff) | |
download | poky-fcff0674078daeb64a251c1f5888d651ee67447c.tar.gz |
devtool: fix update-recipe dry-run mode
When running devtool update-recipe with --mode=srcrev AND --append switch
in dry-run, we get the following error:
Traceback (most recent call last):
[...]
Exception: destpath should be set here
Fix this by removing a misplaced else statement in _update_recipe_srcrev
(From OE-Core rev: 85ba125703d5b442133fd7c470b915460ee68ac9)
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/standard.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index d53fb81007..cd79c7802c 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -1576,11 +1576,10 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi | |||
1576 | patchfields['SRC_URI'] = '\\\n '.join(srcuri) | 1576 | patchfields['SRC_URI'] = '\\\n '.join(srcuri) |
1577 | if dry_run_outdir: | 1577 | if dry_run_outdir: |
1578 | logger.info('Creating bbappend (dry-run)') | 1578 | logger.info('Creating bbappend (dry-run)') |
1579 | else: | 1579 | appendfile, destpath = oe.recipeutils.bbappend_recipe( |
1580 | appendfile, destpath = oe.recipeutils.bbappend_recipe( | 1580 | rd, appendlayerdir, files, wildcardver=wildcard_version, |
1581 | rd, appendlayerdir, files, wildcardver=wildcard_version, | 1581 | extralines=patchfields, removevalues=removevalues, |
1582 | extralines=patchfields, removevalues=removevalues, | 1582 | redirect_output=dry_run_outdir) |
1583 | redirect_output=dry_run_outdir) | ||
1584 | else: | 1583 | else: |
1585 | files_dir = _determine_files_dir(rd) | 1584 | files_dir = _determine_files_dir(rd) |
1586 | for basepath, path in upd_f.items(): | 1585 | for basepath, path in upd_f.items(): |