From: Tuomas Salokanto <tuomas.salokanto@gmail.com>
Date: Tue, 14 Jan 2020 10:49:17 +0000 (+0200)
Subject: recipetool: create: fix SRCBRANCH not being passed to params
X-Git-Tag: 2020-04.2-dunfell~86
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=50789b582908f78d9bb2b5a05418433ad8074825;p=openembedded-core.git

recipetool: create: fix SRCBRANCH not being passed to params

When explicitly passing a branch using --srcbranch in 'devtool add' or
'recipetool create', the branch name is not included in the params of
bb.fetch2.encodeurl and default 'master' branch is used instead.

Signed-off-by: Tuomas Salokanto <tuomas.salokanto@gmail.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0424df825f1e509faf6cd44403c0736bb91b57c3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 6cbf4de674..8d78c5b6f9 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -460,6 +460,7 @@ def create_recipe(args):
                 logger.error('branch= parameter and -B/--srcbranch option cannot both be specified - use one or the other')
                 sys.exit(1)
             srcbranch = args.srcbranch
+            params['branch'] = srcbranch
         nobranch = params.get('nobranch')
         if nobranch and srcbranch:
             logger.error('nobranch= cannot be used if you specify a branch')