diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2016-09-20 08:05:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-20 08:05:57 +0000 |
| commit | 2aa61d0bc827b1eaaf9865f1e1445386571e3f30 (patch) | |
| tree | 76a97f94648a57c4a2225165c3fb8f3d6f861022 | |
| parent | 4aed6f8c7db9f492a4b4073d3050a02ee1922c0f (diff) | |
| parent | 488bf092d5992bd1b8f8681c444f2cc283d05bcb (diff) | |
| download | git-repo-2aa61d0bc827b1eaaf9865f1e1445386571e3f30.tar.gz | |
Merge "Repo: fall back to http, if ssh connection fails for http repos"
| -rw-r--r-- | git_config.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git_config.py b/git_config.py index 0379181a..09c4b48f 100644 --- a/git_config.py +++ b/git_config.py | |||
| @@ -638,7 +638,10 @@ class Remote(object): | |||
| 638 | self._review_url = http_url | 638 | self._review_url = http_url |
| 639 | else: | 639 | else: |
| 640 | host, port = info.split() | 640 | host, port = info.split() |
| 641 | self._review_url = self._SshReviewUrl(userEmail, host, port) | 641 | if _open_ssh(host, port): |
| 642 | self._review_url = self._SshReviewUrl(userEmail, host, port) | ||
| 643 | else: | ||
| 644 | self._review_url = http_url | ||
| 642 | except urllib.error.HTTPError as e: | 645 | except urllib.error.HTTPError as e: |
| 643 | raise UploadError('%s: %s' % (self.review, str(e))) | 646 | raise UploadError('%s: %s' % (self.review, str(e))) |
| 644 | except urllib.error.URLError as e: | 647 | except urllib.error.URLError as e: |
