diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-07-14 18:49:19 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-07-15 18:00:16 +0200 |
| commit | 1a9e2540113ad0a8542f573a6324a1f4b053e757 (patch) | |
| tree | da667f49a48ca3b2cc2a2e4ac0ac072282e016f1 /init-repository.py | |
| parent | 4fcc9713a8805c4adf1c29bec50100681b37ec70 (diff) | |
Use the version tag when checking out chromium
Instead of grepping for the VERSION file update in the git log
check out the sha1 that has been tagged with the requested version.
Also harden the regexp we use to translate svn revisions to git
sha1's and further clean up the findShaAndCheckout function.
Change-Id: Iaeb7ebee558b7ebadaf3428e06626736601198cf
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'init-repository.py')
| -rwxr-xr-x | init-repository.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init-repository.py b/init-repository.py index 5ab0c9e7a..eba61c475 100755 --- a/init-repository.py +++ b/init-repository.py @@ -134,7 +134,7 @@ def initUpstreamSubmodules(): ninja_url = 'https://github.com/martine/ninja.git' chromium_url = 'https://chromium.googlesource.com/chromium/src.git' ninja_shasum = '7103c32646df958b0287c65b1c660bf528a191d6' - chromium_ref = 'refs/branch-heads/' + resolver.currentBranch() + chromium_ref = 'refs/tags/' + resolver.currentVersion() os.chdir(qtwebengine_root) current_submodules = subprocess.check_output(['git', 'submodule']) |