Don't use urljoin() in binarytree.gettbz2() since it doesn't work correctly wih unrec...

svn path=/main/branches/2.1.2/; revision=7028

diff --git a/pym/portage.py b/pym/portage.py
index 2a1c1c6ca69fefbcd362f9156fe0eb4db7b37eb0..79bb3ca0b98472aeb21fd4c6e9ba03303e663898 100644 (file)
--- 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: