commit 3860c7f8731c4718f40a762cffb65f12dc294a69
author kjellander <kjellander@webrtc.org> Tue Jan 19 10:04:41 2016
committer Commit bot <commit-bot@chromium.org> Tue Jan 19 10:04:49 2016
tree 1c6776ed4f95b15cb0ce51699a0a26ecb8da7671
parent c4c84856628c70fada1ada6c4112f5497d993aa6

Fix parsing of CLANG_REVISON from tools/clang/scripts/update.py

The regex didn't match the revision before after the switch
from tools/clang/scripts/update.sh to
tools/clang/scripts/update.py.
This should have been done in https://codereview.webrtc.org/1493683003
when the filename changed.

TESTED=Ran the script and verified parsing worked and showed
the currently pending Clang change in ongoing roll in
https://codereview.webrtc.org/1593713013/
NOTRY=True

Review URL: https://codereview.webrtc.org/1608813002

Cr-Commit-Position: refs/heads/master@{#11299}

tools/autoroller/roll_chromium_revision.py

diff --git a/tools/autoroller/roll_chromium_revision.py b/tools/autoroller/roll_chromium_revision.py
index 1f974e0..4024b19 100755
--- a/tools/autoroller/roll_chromium_revision.py
+++ b/tools/autoroller/roll_chromium_revision.py
@@ -26,7 +26,7 @@
 CHROMIUM_FILE_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s/%s'
 
 COMMIT_POSITION_RE = re.compile('^Cr-Commit-Position: .*#([0-9]+).*$')
-CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION=(\d+)$')
+CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION = \'(\d+)\'$')
 ROLL_BRANCH_NAME = 'roll_chromium_revision'
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -48,6 +48,9 @@
 ChangedDep = collections.namedtuple('ChangedDep',
                                     'path url current_rev new_rev')
 
+class RollError(Exception):
+  pass
+
 
 def ParseDepsDict(deps_content):
   local_scope = {}
@@ -234,7 +237,7 @@
       match = CLANG_REVISION_RE.match(line)
       if match:
         return match.group(1)
-    return None
+    raise RollError('Could not parse Clang revision!')
 
   chromium_src_path = os.path.join(CHECKOUT_ROOT_DIR, 'chromium', 'src',
                                    CLANG_UPDATE_SCRIPT_LOCAL_PATH)
@@ -242,9 +245,9 @@
     current_lines = f.readlines()
   current_rev = GetClangRev(current_lines)
 
-  new_clang_update_sh = ReadRemoteCrFile(CLANG_UPDATE_SCRIPT_URL_PATH,
-                                         new_cr_rev).splitlines()
-  new_rev = GetClangRev(new_clang_update_sh)
+  new_clang_update_py = ReadRemoteCrFile(CLANG_UPDATE_SCRIPT_URL_PATH,
+                                             new_cr_rev).splitlines()
+  new_rev = GetClangRev(new_clang_update_py)
   return ChangedDep(CLANG_UPDATE_SCRIPT_LOCAL_PATH, None, current_rev, new_rev)