summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-09-11 13:08:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:47:24 +0100
commitcd201664b827e37fcabca272262016b171e997d9 (patch)
tree8b6ed915a37b20c8d330aaa9c2f2105ed2eb756b
parent21e044d92e927639a574c43cf7778e31f2e66377 (diff)
downloadopenembedded-core-contrib-cd201664b827e37fcabca272262016b171e997d9.tar.gz
openembedded-core-contrib-cd201664b827e37fcabca272262016b171e997d9.tar.bz2
openembedded-core-contrib-cd201664b827e37fcabca272262016b171e997d9.zip
devtool: update-recipe: get srcuri parameters with decodeurl()
Use already existing bb.fetch.decodeurl() for getting the parameters for a URI. This is more fault tolerant and maintainable. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 5263af56c8..d5900b4f82 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -761,11 +761,8 @@ def _guess_recipe_update_mode(srctree, rdata):
# Just use the first URI for now
uri = git_uris[0]
# Check remote branch
- upstr_branch = 'master'
- for paramdef in uri.split(';')[1:]:
- name, value = paramdef.split('=', 1)
- if name == 'branch':
- upstr_branch = value
+ params = bb.fetch.decodeurl(uri)[5]
+ upstr_branch = params['branch'] if 'branch' in params else 'master'
# Check if current branch HEAD is found in upstream branch
stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree)
head_rev = stdout.rstrip()