Fix gcl to pass in the suggested owners properly.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 305 matching lines @@
 
     parsed_lines = []
     reviewers_re = re.compile(REVIEWERS_REGEX)
     reviewers = ''
     subject = ''
     for l in description.splitlines():
       if not subject:
         subject = l
       matched_reviewers = reviewers_re.match(l)
       if matched_reviewers:
-        reviewers = matched_reviewers.group(1)
+        reviewers = matched_reviewers.group(1).split(',')
       parsed_lines.append(l)
 
     if len(subject) > 100:
       subject = subject[:97] + '...'
 
     self._subject = subject
     self._reviewers = reviewers
     self._description = '\n'.join(parsed_lines)
 
   description = property(_get_description, _set_description)
@@ skipping 422 matching lines @@
 
 def OptionallyDoPresubmitChecks(change_info, committing, args):
   if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
     return presubmit_support.PresubmitOutput()
   return DoPresubmitChecks(change_info, committing, True)
 
 
 def suggest_reviewers(change_info, affected_files):
   owners_db = owners.Database(change_info.GetLocalRoot(), fopen=file,
                               os_path=os.path)
-  return owners_db.reviewers_for(affected_files)
+  return owners_db.reviewers_for([f[1] for f in affected_files])
 
 
 def defer_attributes(a, b):
   """Copy attributes from an object (like a function) to another."""
   for x in dir(a):
     if not getattr(b, x, None):
       setattr(b, x, getattr(a, x))
 
 
 def need_change(function):
@@ skipping 309 matching lines @@
       description = change_info.description
 
   other_files = GetFilesNotInCL()
 
   # Edited files (as opposed to files with only changed properties) will have
   # a letter for the first character in the status string.
   file_re = re.compile(r"^[a-z].+\Z", re.IGNORECASE)
   affected_files = [x for x in other_files if file_re.match(x[0])]
   unaffected_files = [x for x in other_files if not file_re.match(x[0])]
 
-  suggested_reviewers = suggest_reviewers(change_info, affected_files)
-  if suggested_reviewers:
-    reviewers_re = re.compile(REVIEWERS_REGEX)
-    if not any(
-        reviewers_re.match(l) for l in description.splitlines()):
-      description += '\nR=' + ','.join(suggested_reviewers) + '\n'
+  if not change_info.reviewers:
+    suggested_reviewers = suggest_reviewers(change_info, affected_files)
+    if suggested_reviewers:
+      reviewers_re = re.compile(REVIEWERS_REGEX)
+      if not any(
+          reviewers_re.match(l) for l in description.splitlines()):
+        description += '\nR=' + ','.join(suggested_reviewers) + '\n'
 
   separator1 = ("\n---All lines above this line become the description.\n"
                 "---Repository Root: " + change_info.GetLocalRoot() + "\n"
                 "---Paths in this changelist (" + change_info.name + "):\n")
   separator2 = "\n\n---Paths modified but not in any changelist:\n\n"
   text = (description + separator1 + '\n' +
           '\n'.join([f[0] + f[1] for f in change_info.GetFiles()]))
 
   if change_info.Exists():
     text += (separator2 +
@@ skipping 346 matching lines @@
     if e.code != 500:
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))