On Wed, 2018-10-10 at 17:35 +0200, Olof Johansson wrote: > For conditonally applied patches based on SRC_URI overrides, the > devtool-source class would try to create a new branch for each > override > assignment as a postfunc to do_patch, but if the same override was > used > multiple times, it would try to create the same branch multiple > times, > causing errors like > > > Exception: bb.process.ExecutionError: Execution of > > \ 'git checkout f0f0f0f0f0ff0f0f0f0f0f0f0f0f0f0f0ff0f0f0 -b > devtool-override-foo' > \ failed with exit code 128: > > fatal: A branch named 'devtool-override-foo' already exists. > > This change makes sure that the devtool-source bbclass will only > create > one branch per override. > > Change-Id: I8adca0b54179793ca92478ad5b3b1b6e0448e26b > Signed-off-by: Olof Johansson <[email protected]> > --- > meta/classes/devtool-source.bbclass | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-)
This breaks the oe-selftest devtool tests: https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/46751/raw oe-selftest -r devtool should reproduce. Cheers, Richard -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
