mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Fixed handling of Bazaar's bzr+ssh scheme.
This commit is contained in:
parent
d99c2b46ac
commit
e7431fd858
1 changed files with 7 additions and 4 deletions
11
pip.py
11
pip.py
|
@ -3316,10 +3316,6 @@ class Bazaar(VersionControl):
|
|||
if branch:
|
||||
logger.notify('Checking out %s%s to %s'
|
||||
% (url, rev_display, display_path(dest)))
|
||||
# FIXME: find a better place to hotfix the URL scheme
|
||||
# after removing bzr+ from bzr+ssh:// readd it
|
||||
if url.startswith('ssh://'):
|
||||
url = 'bzr+' + url
|
||||
if update:
|
||||
call_subprocess(
|
||||
[BZR_CMD, 'pull', '-q'] + rev_options + [url], cwd=dest)
|
||||
|
@ -3327,6 +3323,13 @@ class Bazaar(VersionControl):
|
|||
call_subprocess(
|
||||
[BZR_CMD, 'branch', '-q'] + rev_options + [url, dest])
|
||||
|
||||
def get_url_rev(self):
|
||||
# hotfix the URL scheme after removing bzr+ from bzr+ssh:// readd it
|
||||
url, rev = super(Bazaar, self).get_url_rev()
|
||||
if url.startswith('ssh://'):
|
||||
url = 'bzr+' + url
|
||||
return url, rev
|
||||
|
||||
def get_url(self, location):
|
||||
urls = call_subprocess(
|
||||
[BZR_CMD, 'info'], show_stdout=False, cwd=location)
|
||||
|
|
Loading…
Reference in a new issue