diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 7 |
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): | |||
761 | # Just use the first URI for now | 761 | # Just use the first URI for now |
762 | uri = git_uris[0] | 762 | uri = git_uris[0] |
763 | # Check remote branch | 763 | # Check remote branch |
764 | upstr_branch = 'master' | 764 | params = bb.fetch.decodeurl(uri)[5] |
765 | for paramdef in uri.split(';')[1:]: | 765 | upstr_branch = params['branch'] if 'branch' in params else 'master' |
766 | name, value = paramdef.split('=', 1) | ||
767 | if name == 'branch': | ||
768 | upstr_branch = value | ||
769 | # Check if current branch HEAD is found in upstream branch | 766 | # Check if current branch HEAD is found in upstream branch |
770 | stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree) | 767 | stdout, _ = bb.process.run('git rev-parse HEAD', cwd=srctree) |
771 | head_rev = stdout.rstrip() | 768 | head_rev = stdout.rstrip() |