From: Markus Lehtonen Date: Fri, 11 Sep 2015 10:08:08 +0000 (+0300) Subject: devtool: update-recipe: get srcuri parameters with decodeurl() X-Git-Tag: 2015-10~434 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=cd201664b827e37fcabca272262016b171e997d9;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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()