Emergency fix to avoid gerrit 2.9

testing_support/gerrit-init.sh

 #!/bin/bash
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -e
 
 http_port=8080
 ssh_port=29418
 
@@ skipping 59 matching lines @@
 #      ...
 #    }
 #
 # ...and prints the name and md5sum of the corresponding *.war file.
 
 import json
 import re
 import sys
 
 requested_version = sys.argv[1] if len(sys.argv) > 1 else None
-gerrit_re = re.compile('gerrit(?:-full)?-([0-9.]+)(-rc[0-9]+)?[.]war')
+# Disable using -rc versions.  This is a temporary hack to avoid
+# picking up version 2.9-rc0, which requires java 7.  These lines
+# should be un-commented after this bug is fixed:
+#   https://code.google.com/p/chromium/issues/detail?id=346369
+#gerrit_re = re.compile('gerrit(?:-full)?-([0-9.]+)(-rc[0-9]+)?[.]war')
+gerrit_re = re.compile('gerrit(?:-full)?-([0-9.]+)[.]war')
 j = json.load(sys.stdin)
 items = [(x, gerrit_re.match(x['name'])) for x in j['items']]
-items = [(x, m.group(1), m.group(2)) for x, m in items if m]
+#items = [(x, m.group(1), m.group(2)) for x, m in items if m]
+items = [(x, m.group(1), '') for x, m in items if m]
 def _cmp(a, b):
   an = a[1].split('.')
   bn = b[1].split('.')
   while len(an) < len(bn):
     an.append('0')
   while len(bn) < len(an):
     bn.append('0')
-#  Disable using -rc versions.  This is a temporary hack to avoid
-#  picking up version 2.9-rc0, which requires java 7.  These lines
-#  should be un-commented after this bug is fixed:
-#    https://code.google.com/p/chromium/issues/detail?id=346369
-#  an.append(a[2][3:] if a[2] else '1000')
-#  bn.append(b[2][3:] if b[2] else '1000')
+  an.append(a[2][3:] if a[2] else '1000')
+  bn.append(b[2][3:] if b[2] else '1000')
   for i in range(len(an)):
     if an[i] != bn[i]:
       return -1 if int(an[i]) > int(bn[i]) else 1
   return 0
 
 if requested_version:
   for info, version in items:
     if version == requested_version:
       print '"%s" "%s"' % (info['name'], info['md5Hash'])
       sys.exit(0)
@@ skipping 96 matching lines @@
 To use SSH API:
   ssh ${username}@localhost -p ${ssh_port} -i ${rundir}/tmp/id_rsa gerrit
 
 To enable 'git push' without a password prompt:
   git config credential.helper 'store --file=${rundir}/tmp/.git-credentials'
 
 To stop the server:
   ${rundir}/bin/gerrit.sh stop
 
 EOF