]> code.ossystems Code Review - openembedded-core.git/commit
devtool: Avoid failure for recipes with S == WORKDIR and no local files
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Thu, 29 Aug 2019 20:43:02 +0000 (22:43 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 31 Aug 2019 07:44:19 +0000 (08:44 +0100)
commit3fdf304e72a1fb5de8bf9bc21e5b598fefb08648
tree347617d86f870445a9991ad26db36d2dc5d485c2
parent88fb1140f4b65ed33cdd4152ef506461a33371a5
devtool: Avoid failure for recipes with S == WORKDIR and no local files

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.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/devtool/standard.py