From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 25 Jun 2007 06:28:38 +0000 (-0000)
Subject: Don't use urljoin() in binarytree.gettbz2() since it doesn't work correctly wih unrec... 
X-Git-Tag: v2.1.3~143
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=658cc7d3a1062a20540966dbd2bad3cde6aa7329;p=portage.git

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
---

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: