Continue running if the upstream remote exists.

slave/skia_slave_scripts/merge_into_android.py

Index: slave/skia_slave_scripts/merge_into_android.py
diff --git a/slave/skia_slave_scripts/merge_into_android.py b/slave/skia_slave_scripts/merge_into_android.py
index f072d86b8d5f599adf29d9c855883d10b92207ec..39607ee2c22edcc550bfffc1ecc751d9a6048b6b 100644
--- a/slave/skia_slave_scripts/merge_into_android.py
+++ b/slave/skia_slave_scripts/merge_into_android.py
@@ -56,8 +56,15 @@ class MergeIntoAndroid(BuildStep):
     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:

[borenet, 2014/06/05 18:40:44]

It'd probably be a good idea to do something like this:

except shell_utils.CommandFailedException as e:
  if 'remote %s already exists' % UPSTREAM_REMOTE_NAME in e.output:
    print('warning...')
  else:
    raise

[scroggo, 2014/06/05 18:53:08]

Done.

+          # Accept this error. If it failed for a reason other than the
+          # remote already existing, we'll see the error when we attempt to do
+          # a git fetch.
+          print ('%s was already added. Why did it not show in git remote'
+                 ' show?' % UPSTREAM_REMOTE_NAME)
 
       # Update the upstream remote.
       shell_utils.run([GIT, 'fetch', UPSTREAM_REMOTE_NAME])