mirror of
https://gerrit.googlesource.com/git-repo
synced 2025-01-08 16:14:26 +00:00
Merge "Handle HTTPException when attempting to get ssh_info"
This commit is contained in:
commit
a1f77d92c6
@ -40,6 +40,10 @@ else:
|
|||||||
from signal import SIGTERM
|
from signal import SIGTERM
|
||||||
from error import GitError, UploadError
|
from error import GitError, UploadError
|
||||||
from trace import Trace
|
from trace import Trace
|
||||||
|
if is_python3():
|
||||||
|
from http.client import HTTPException
|
||||||
|
else:
|
||||||
|
from httplib import HTTPException
|
||||||
|
|
||||||
from git_command import GitCommand
|
from git_command import GitCommand
|
||||||
from git_command import ssh_sock
|
from git_command import ssh_sock
|
||||||
@ -608,6 +612,8 @@ class Remote(object):
|
|||||||
raise UploadError('%s: %s' % (self.review, str(e)))
|
raise UploadError('%s: %s' % (self.review, str(e)))
|
||||||
except urllib.error.URLError as e:
|
except urllib.error.URLError as e:
|
||||||
raise UploadError('%s: %s' % (self.review, str(e)))
|
raise UploadError('%s: %s' % (self.review, str(e)))
|
||||||
|
except HTTPException as e:
|
||||||
|
raise UploadError('%s: %s' % (self.review, e.__class__.__name__))
|
||||||
|
|
||||||
REVIEW_CACHE[u] = self._review_url
|
REVIEW_CACHE[u] = self._review_url
|
||||||
return self._review_url + self.projectname
|
return self._review_url + self.projectname
|
||||||
|
Loading…
Reference in New Issue
Block a user