diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-25 06:28:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-25 06:28:38 +0000 |
| commit | 658cc7d3a1062a20540966dbd2bad3cde6aa7329 (patch) | |
| tree | 9e347beac39e32b46c852fcdeee0e6ee3972b538 /pym | |
| parent | 4fbcaef8d7ff602606bcf26d1c3ce1a30da6c9a4 (diff) | |
| download | portage-658cc7d3a1062a20540966dbd2bad3cde6aa7329.tar.gz portage-658cc7d3a1062a20540966dbd2bad3cde6aa7329.tar.bz2 portage-658cc7d3a1062a20540966dbd2bad3cde6aa7329.zip | |
Don't use urljoin() in binarytree.gettbz2() since it doesn't work correctly wih unrecognized protocols like sftp. (trunk r7027)
svn path=/main/branches/2.1.2/; revision=7028
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 2a1c1c6ca..79bb3ca0b 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6818,8 +6818,9 @@ class binarytree(object): os.makedirs(mydest, 0775) except (OSError, IOError): pass - from urlparse import urljoin, urlparse - url = urljoin(self.settings["PORTAGE_BINHOST"], tbz2name) + from urlparse import urlparse + # urljoin doesn't work correctly with unrecognized protocols like sftp + url = self.settings["PORTAGE_BINHOST"].rstrip("/") + "/" + tbz2name protocol = urlparse(url)[0] fcmd_prefix = "FETCHCOMMAND" if resume: |