Index: scripts/master/chromium_step.py |
=================================================================== |
--- scripts/master/chromium_step.py (revision 181110) |
+++ scripts/master/chromium_step.py (working copy) |
@@ -101,13 +101,16 @@ |
def startVC(self, branch, revision, patch): |
warnings = [] |
args = copy.copy(self.args) |
- wk_revision = revision |
+ wk_revision = None |
try: |
# parent_wk_revision might be set, but empty. |
if self.getProperty('parent_wk_revision'): |
wk_revision = self.getProperty('parent_wk_revision') |
except KeyError: |
pass |
+ if patch and patch[1].startswith('third_party/WebKit@HEAD'): |
+ wk_revision = 'HEAD' |
Dirk Pranke
2013/02/07 03:42:33
are you sure "HEAD" works here? don't the try serv
M-A Ruel
2013/02/07 14:01:53
I kind of agree I'd prefer a regexp to allow numbe
tony
2013/02/07 22:13:49
HEAD does work, but I've switched it to a regex to
|
+ |
nacl_revision = revision |
try: |
# parent_nacl_revision might be set, but empty. |
@@ -125,9 +128,13 @@ |
args['revision'] = revision |
args['branch'] = branch |
if args.get('gclient_spec'): |
+ if wk_revision: |
+ args['gclient_spec'] = args['gclient_spec'].replace( |
+ '$$WK_REV$$', str(wk_revision)) |
+ else: |
+ args['gclient_spec'] = args['gclient_spec'].replace( |
+ ',"webkit_revision":"$$WK_REV$$"', '') |
args['gclient_spec'] = args['gclient_spec'].replace( |
- '$$WK_REV$$', str(wk_revision or '')) |
- args['gclient_spec'] = args['gclient_spec'].replace( |
'$$NACL_REV$$', str(nacl_revision or '')) |
if patch: |
args['patch'] = patch |