[OE-core] [PATCH] devtool: Avoid failure for recipes with S == WORKDIR and no local files
Paul Eggleton
paul.eggleton at linux.intel.com
Mon Sep 2 10:20:19 UTC 2019
On Friday, 30 August 2019 8:43:02 AM NZST Peter Kjellerstedt wrote:
> When extracting the sources for a recipe that has S == WORKDIR and no
> local files in the SRC_URI (which, e.g., can happen for a recipe with
> a URI that has the unpack=false attribute), the extraction fails with
> the following backtrace:
>
> Traceback (most recent call last):
> File ".../scripts/devtool", line 344, in <module>
> ret = main()
> File ".../scripts/devtool", line 331, in main
> ret = args.func(args, config, basepath, workspace)
> File ".../poky/scripts/lib/devtool/standard.py", line 762, in
> modify
> initial_rev, _ = _extract_source(srctree, args.keep_temp,
> args.branch, False, config, basepath, workspace,
> args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides)
> File ".../poky/scripts/lib/devtool/standard.py", line 647, in
> _extract_source
> bb.process.run('git %s commit -a -m "Committing local file
> symlinks\n\n%s"' % (' '.join(useroptions),
> oe.patch.GitApplyTree.ignore_commit_prefix), cwd=srctree)
> File ".../poky/bitbake/lib/bb/process.py", line 178, in run
> raise ExecutionError(cmd, pipe.returncode, stdout, stderr)
> bb.process.ExecutionError: Execution of 'git commit -a -m
> "Committing local file symlinks
>
> %% ignore"' failed with exit code 1:
> On branch devtool
> nothing to commit, working tree clean
>
> This is because no files were found in the oe-local-files directory
> and consequently no symbolic links were added using `git add`, but the
> `git commit` command was still executed.
Looks good to me - all oe-selftest tests pass as well. (Looks like maybe we
are missing a test though, since this code has been in place for a while.)
Acked-by: Paul Eggleton <paul.eggleton at linux.intel.com>
--
Paul Eggleton
Intel Open Source Technology Centre
More information about the Openembedded-core
mailing list