From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 12 Oct 2007 10:54:02 +0000 (-0000)
Subject: Solve bug where portage would not "see" my binhost because
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5789820ce7d3514b91199ac6219c78b54802a82e;p=portage.git

Solve bug where portage would not "see" my binhost because
PORTAGE_BINHOST didn't end with a /.  This is actually caused by urljoin
not operating like os.path.join would do.


svn path=/main/branches/prefix/; revision=8081
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 91259c0a2..db8b192ae 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -560,6 +560,9 @@ class binarytree(object):
 			not self._remotepkgs:
 
 			base_url = self.settings["PORTAGE_BINHOST"]
+			# ensure the URL ends with a /, otherwise urljoin strips off
+			# the last directory, before it adds "Packages"
+			base_url = base_url.rstrip("/") + "/"
 			from portage.const import CACHE_PATH
 			from urlparse import urlparse
 			urldata = urlparse(base_url)