Fixed upload to remotes with the url ssh://hostname

Change-Id: I1d0dd4d3f90eac45205f6f4ca98a29b0babdbc3f
This commit is contained in:
Christian Koestlin 2016-12-05 20:32:45 +01:00 committed by David Pursehouse
parent 9ead97bb51
commit 2ec2a5d64c

View File

@ -620,7 +620,7 @@ class Remote(object):
u = self.review u = self.review
if u.startswith('persistent-'): if u.startswith('persistent-'):
u = u[len('persistent-'):] u = u[len('persistent-'):]
if u.split(':')[0] not in ('http', 'https', 'sso'): if u.split(':')[0] not in ('http', 'https', 'sso', 'ssh'):
u = 'http://%s' % u u = 'http://%s' % u
if u.endswith('/Gerrit'): if u.endswith('/Gerrit'):
u = u[:len(u) - len('/Gerrit')] u = u[:len(u) - len('/Gerrit')]
@ -636,7 +636,7 @@ class Remote(object):
host, port = os.environ['REPO_HOST_PORT_INFO'].split() host, port = os.environ['REPO_HOST_PORT_INFO'].split()
self._review_url = self._SshReviewUrl(userEmail, host, port) self._review_url = self._SshReviewUrl(userEmail, host, port)
REVIEW_CACHE[u] = self._review_url REVIEW_CACHE[u] = self._review_url
elif u.startswith('sso:'): elif u.startswith('sso:') or u.startswith('ssh:'):
self._review_url = u # Assume it's right self._review_url = u # Assume it's right
REVIEW_CACHE[u] = self._review_url REVIEW_CACHE[u] = self._review_url
elif 'REPO_IGNORE_SSH_INFO' in os.environ: elif 'REPO_IGNORE_SSH_INFO' in os.environ: