From 1b5b82c6f499f1b742cc9f65c7a82d8738a65c52 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 27 Mar 2009 11:45:43 +0000 Subject: [PATCH] sync with trunk, remove our binhost url fix, better have same behaviour as trunk, whether or not this is better svn path=/main/branches/prefix/; revision=13235 --- pym/portage/dbapi/bintree.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 5009fc875..b5cfcb7d1 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -169,7 +169,7 @@ class binarytree(object): "PDEPEND", "PROPERTIES", "PROVIDE") self._pkgindex_header_keys = set(["ACCEPT_KEYWORDS", "CBUILD", "CHOST", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES", - "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EAPI", "EPREFIX"]) + "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EPREFIX"]) self._pkgindex_default_pkg_data = { "DEPEND" : "", "EAPI" : "0", @@ -641,9 +641,6 @@ 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) -- 2.26.2