devtool: update-recipe: get srcuri parameters with decodeurl()
PATCH 1/1 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 <[email protected]>
--- scripts/lib/devtool/standard.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
scripts/lib/devtool/standard.py +2 -5
@@ -766,11 +766,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()
Signature · 1 line
2.1.4