1 files changed, 32 insertions, 45 deletions
diff --git a/infra/bots/upload_md.py b/infra/bots/upload_md.py
index 6ee5ba13a7..2632a32ef6 100644
--- a/infra/bots/upload_md.py
+++ b/infra/bots/upload_md.py
@@ -13,70 +13,57 @@ import sys
 import git_utils
 
 
-SKIA_COMMITTER_EMAIL = 'update-docs@skia.org'
-SKIA_COMMITTER_NAME = 'Update Docs'
 SKIA_REPO = 'https://skia.googlesource.com/skia.git'
 COMMIT_MSG = '''Update markdown files
 
 Automatic commit by the Housekeeper-Nightly-Bookmaker bot.
 
-TBR=%s
+TBR=rmistry@google.com
 NO_MERGE_BUILDS
-''' % SKIA_COMMITTER_EMAIL
+'''
 CC_LIST = ['rmistry@google.com', 'caryclark@google.com']
 
 
 def main():
   parser = argparse.ArgumentParser()
-  parser.add_argument("--gitcookies")
   parser.add_argument("--bookmaker_binary")
   parser.add_argument("--fiddlecli_output")
   args = parser.parse_args()
 
   with git_utils.NewGitCheckout(repository=SKIA_REPO):
-    config_dict = {
-        'user.name': SKIA_COMMITTER_NAME,
-        'user.email': SKIA_COMMITTER_EMAIL,
-        'http.cookiefile': args.gitcookies,
-    }
-    # Skip GCE Auth in depot_tools/gerrit_utils.py. Use gitcookies instead.
-    os.environ['SKIP_GCE_AUTH_FOR_GIT'] = 'True'
-    os.environ['GIT_COOKIES_PATH'] = args.gitcookies
+    with git_utils.GitBranch(branch_name='update_md_files',
+                             commit_msg=COMMIT_MSG,
+                             commit_queue=True,
+                             upload=False,
+                             cc_list=CC_LIST) as git_branch:
+      # Run bookmaker binary.
+      cmd = [args.bookmaker_binary,
+             '-b', 'docs',
+             '-f', args.fiddlecli_output,
+             '-r', 'site/user/api',
+             ]
+      try:
+        subprocess.check_call(cmd)
+      except subprocess.CalledProcessError as e:
+        print >> sys.stderr, (
+            'Running %s failed, not uploading markdowns update:\n\n%s' % (
+                cmd, e.output))
+        sys.exit(1)
 
-    with git_utils.GitLocalConfig(config_dict):
-      with git_utils.GitBranch(branch_name='update_md_files',
-                               commit_msg=COMMIT_MSG,
-                               commit_queue=True,
-                               upload=False,
-                               cc_list=CC_LIST) as git_branch:
-        # Run bookmaker binary.
-        cmd = [args.bookmaker_binary,
-               '-b', 'docs',
-               '-f', args.fiddlecli_output,
-               '-r', 'site/user/api',
-               ]
-        try:
-          subprocess.check_call(cmd)
-        except subprocess.CalledProcessError as e:
+      # Verify that only files in the expected directory are going to be
+      # committed and uploaded.
+      diff_files = subprocess.check_output(['git', 'diff', '--name-only'])
+      for diff_file in diff_files.split():
+        if not diff_file.startswith('site/user/api/'):
           print >> sys.stderr, (
-              'Running %s failed, not uploading markdowns update:\n\n%s' % (
-                  cmd, e.output))
+            'Some files in %s were not in the site/user/api dir. '
+            'Not uploading them' % diff_files)
           sys.exit(1)
-
-          # Verify that only files in the expected directory are going to be
-          # committed and uploaded.
-        diff_files = subprocess.check_output(['git', 'diff', '--name-only'])
-        for diff_file in diff_files.split():
-          if not diff_file.startswith('site/user/api/'):
-            print >> sys.stderr, (
-              'Some files in %s were not in the site/user/api dir. '
-              'Not uploading them' % diff_files)
-            sys.exit(1)
-        if diff_files:
-          subprocess.check_call(['git', 'add', '-u'])
-          git_branch.commit_and_upload(True)
-        else:
-          print 'No changes so nothing to upload.'
+      if diff_files:
+        subprocess.check_call(['git', 'add', '-u'])
+        git_branch.commit_and_upload(True)
+      else:
+        print 'No changes so nothing to upload.'
 
 
 if '__main__' == __name__: