summaryrefslogtreecommitdiffstats
path: root/tools/scripts/version_resolver.py
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-25 14:55:56 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-28 17:20:36 +0100
commit25ff83bc7b3e921aa540b88f6c848a78ee7d461f (patch)
tree4a455f2410e5e1c0cbdfd91a4dce40c75532c9f0 /tools/scripts/version_resolver.py
parent175dba21885a5bcbd031c1cbc394825b5fbb783e (diff)
Update patches to stable branch 1750
Change-Id: I85149bf4405420813d07bee5259f11a192e86a73 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Diffstat (limited to 'tools/scripts/version_resolver.py')
-rw-r--r--tools/scripts/version_resolver.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index b52b8f50..5c625472 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -48,8 +48,8 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '31.0.1650.63'
-chromium_branch = '1650'
+chromium_version = '33.0.1750.149'
+chromium_branch = '1750'
json_url = 'http://omahaproxy.appspot.com/all.json'
git_deps_url = 'http://src.chromium.org/chrome/branches/' + chromium_branch + '/src/.DEPS.git'
@@ -74,6 +74,14 @@ def readReleaseChannels():
channels[os].append({ 'channel': ver['channel'], 'version': ver['version'], 'branch': ver['true_branch'] })
return channels
+def repositoryUrlFix(submodule):
+ # The git repository info for webrtc is outdated in the 1750
+ # branch's .DEPS.git file, so we have to update the url.
+ # We should be able to remove this with a branch post 1750.
+ repository_url = submodule.url
+ if 'external/webrtc/stable' in repository_url:
+ submodule.url = repository_url.replace('external/webrtc/stable', 'external/webrtc/trunk')
+
def sanityCheckModules(submodules):
submodule_dict = {}
sys.stdout.write('\nverifying submodule refs.')
@@ -92,13 +100,13 @@ def sanityCheckModules(submodules):
sys.exit('ERROR: branch mismatch for ' + submodule.path + '(' + prev_module.ref + ' vs ' + submodule.ref + ')')
print('Duplicate submodule ' + submodule.path + '. Using latest revison ' + str(submodule.revision) + '.')
if submodule.ref:
+ repositoryUrlFix(submodule)
sys.stdout.write('.')
result = subprocess.check_output(['git', 'ls-remote', submodule.url, submodule.ref])
- # Fallback to git shasum if the parsed remote ref does not exist in the git repository.
if submodule.ref not in result:
- submodule.ref = submodule.revision = ''
- if not submodule.shasum:
- sys.exit('\nERROR: No valid remote found!')
+ # We could fall back to the git shasum if the parsed remote ref does not exist in
+ # the git repository but that would most certainly be outdated, so bail out here.
+ sys.exit('\nERROR: No valid remote found!')
sys.stdout.flush()
submodule_dict[submodule.path] = submodule
print('done.\n')