]> code.ossystems Code Review - openembedded-core.git/commit
devtool: update-recipe: handle where SRC_URI is appended to with +=
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Thu, 14 Apr 2016 08:24:18 +0000 (20:24 +1200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 15 Apr 2016 05:57:47 +0000 (06:57 +0100)
commitda5cd84794e1ab5c4efcd6250d3b93a46f610744
tree833968d3db84499b590745b83db1a611bd2936a0
parent5d3d6224ec2abbbeb5b9a292d208040b89cc4b98
devtool: update-recipe: handle where SRC_URI is appended to with +=

If a recipe sets SRC_URI and then appends more items to it with +=
(such as the current rpm recipe in OE-Core), the code in
patch_recipe_file() was failing with a traceback. Work around the
problem for now by dropping the existing lines if we understand the
operation, else just set the value outright at the end. This leaves
something to be desired as it either doesn't respect the existing
structure or leaves a mess but it's better than the current
breakage.

We'll need to come up with a better solution later. Part of the problem
is the existing code structure doesn't allow for patch_recipe_file() to
know what's being added or removed - it only knows the final value that
the caller wants set.

Fixes [YOCTO #9458].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/recipeutils.py