Continue running if the upstream remote exists.

slave/skia_slave_scripts/merge_into_android.py

 #!/usr/bin/env python
 # Copyright (c) 2014 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.
 
 
 """Merge Skia into Android."""
 
 
 import os
@@ skipping 38 matching lines @@
 
 
 class MergeIntoAndroid(BuildStep):
   """BuildStep which merges Skia into Android, with a generated Android.mk and
   SkUserConfig.h"""
 
   def _Run(self):
     with misc.ChDir(EXTERNAL_SKIA):
       # Check to see whether there is an upstream yet.
       if not UPSTREAM_REMOTE_NAME in shell_utils.run([GIT, 'remote', 'show']):
-        shell_utils.run([GIT, 'remote', 'add', UPSTREAM_REMOTE_NAME,
-                         SKIA_REPO_URL])
+        try:
+          shell_utils.run([GIT, 'remote', 'add', UPSTREAM_REMOTE_NAME,
+                           SKIA_REPO_URL])
+        except shell_utils.CommandFailedException as e:
+          if 'remote %s already exists' % UPSTREAM_REMOTE_NAME in e.output:
+            # Accept this error. The upstream remote name should have been in
+            # the output of git remote show, which would have made us skip this
+            # redundant command anyway.
+            print ('%s was already added. Why did it not show in git remote'
+                   ' show?' % UPSTREAM_REMOTE_NAME)
+          else:
+            raise e
 
       # Update the upstream remote.
       shell_utils.run([GIT, 'fetch', UPSTREAM_REMOTE_NAME])
 
       # Create a stack of commits to submit, one at a time, until we reach a
       # commit that has already been merged.
       commit_stack = []
       head = git_utils.ShortHash('HEAD')
 
       print 'HEAD is at %s' % head
@@ skipping 101 matching lines @@
             RepoAbandon(LOCAL_BRANCH_NAME)
             raise BuildStepFailure('git push failed!')
 
           # Our branch is no longer needed. Remove it.
           shell_utils.run([REPO, 'sync', '-j32', '.'])
           shell_utils.run([REPO, 'prune', '.'])
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(MergeIntoAndroid))