mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

devtool: update-recipe: get srcuri parameters with decodeurl()

Browse Source 
Use already existing bb.fetch.decodeurl() for getting the parameters for
a URI. This is more fault tolerant and maintainable.

(From OE-Core rev: cd201664b827e37fcabca272262016b171e997d9)

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Lehtonen
2015-09-11 13:08:08 +03:00
committed by Richard Purdie
parent 9cda8f782f
commit 06cde90f9f
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/devtool/standard.py
View File

@@ -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()