Continue running if the upstream remote exists.

Continue running if the upstream remote exists.

We already have code to check the git remotes to see if the upstream
exists, but apparently it does not always succeed (see
http://108.170.220.27:10115/builders/Housekeeper-PerCommit-AndroidRoll/builds/684/steps/Merge/logs/stdio
and
http://108.170.220.27:10115/builders/Housekeeper-PerCommit-AndroidRoll/builds/662/steps/Merge/logs/stdio
).

Committed: https://skia.googlesource.com/buildbot/+/172a50459340ecb4986a3b3892a8a02f43391503

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

I wonder if this has something to do with the authentication we changed?

https://codereview.chromium.org/317823006/diff/1/slave/skia_slave_scripts/mer...
File slave/skia_slave_scripts/merge_into_android.py (right):

https://codereview.chromium.org/317823006/diff/1/slave/skia_slave_scripts/mer...
slave/skia_slave_scripts/merge_into_android.py:62: except
shell_utils.CommandFailedException:
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]

https://codereview.chromium.org/317823006/diff/1/slave/skia_slave_scripts/mer...
File slave/skia_slave_scripts/merge_into_android.py (right):

https://codereview.chromium.org/317823006/diff/1/slave/skia_slave_scripts/mer...
slave/skia_slave_scripts/merge_into_android.py:62: except
shell_utils.CommandFailedException:
On 2014/06/05 18:40:44, borenet wrote:
> 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

Done.

[borenet, 2014-06-05 18:56:21]

LGTM

[scroggo, 2014-06-05 18:58:11]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-06-05 18:59:09]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/scroggo@google.com/317823006/20001

[commit-bot: I haz the power, 2014-06-05 18:59:20]

Change committed as 172a50459340ecb4986a3b3892a8a02f43391503