Fix condition where no author would be retrieved (revert on a branch for ...

drover.py

 # Copyright (c) 2009 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.
 
 import optparse
 import os
 import re
 import subprocess
 import sys
 import webbrowser
@@ skipping 459 matching lines @@
     deleteRevision(url, revision)
   elif options.revert:
     action = "Revert"
     if options.branch:
       url = BRANCH_URL.replace("$branch", options.branch)
     checkoutRevision(url, revision, url, True)
     revertRevision(url, revision)
     revertExportRevision(url, revision)
 
   # Check the base url so we actually find the author who made the change
-  author = getAuthor(url, revision)
+  if options.auditor:
+    author = options.auditor
+  else:
+    author = getAuthor(url, revision)
+    if not author:
+      author = getAuthor(TRUNK_URL, revision)
 
   filename = str(revision)+".txt"
   out = open(filename,"w")
   out.write(action +" " + str(revision) + " - ")
   out.write(getRevisionLog(url, revision))
   if (author):
     out.write("TBR=" + author)
   out.close()
 
   change_cmd = 'change ' + str(revision) + " " + filename
@@ skipping 34 matching lines @@
   option_parser.add_option('-m', '--merge', type="int",
                            help='Revision to merge from trunk to branch')
   option_parser.add_option('-b', '--branch',
                            help='Branch to revert or merge from')
   option_parser.add_option('-s', '--sbranch',
                            help='Source branch for merge')
   option_parser.add_option('-r', '--revert', type="int",
                            help='Revision to revert')
   option_parser.add_option('-w', '--workdir',
                            help='subdir to use for the revert')
+  option_parser.add_option('-a', '--auditor',
+                           help='overrides the author for reviewer')                           
   option_parser.add_option('', '--revertbot', action='store_true',
                            default=False)
   option_parser.add_option('', '--revertbot-commit', action='store_true',
                            default=False)
   option_parser.add_option('', '--revertbot-reviewers')
   options, args = option_parser.parse_args()
 
   if not options.merge and not options.revert:
     option_parser.error("You need at least --merge or --revert")
     sys.exit(1)
 
   if options.merge and not options.branch:
     option_parser.error("--merge requires a --branch")
     sys.exit(1)
 
-  sys.exit(main(options, args))
+  sys.exit(main(options, args))