| 1 |
Author: grobian |
| 2 |
Date: 2009-03-27 11:45:43 +0000 (Fri, 27 Mar 2009) |
| 3 |
New Revision: 13235 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/portage/dbapi/bintree.py |
| 7 |
Log: |
| 8 |
sync with trunk, remove our binhost url fix, better have same behaviour as trunk, whether or not this is better |
| 9 |
|
| 10 |
Modified: main/branches/prefix/pym/portage/dbapi/bintree.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/pym/portage/dbapi/bintree.py 2009-03-27 11:43:55 UTC (rev 13234) |
| 13 |
+++ main/branches/prefix/pym/portage/dbapi/bintree.py 2009-03-27 11:45:43 UTC (rev 13235) |
| 14 |
@@ -169,7 +169,7 @@ |
| 15 |
"PDEPEND", "PROPERTIES", "PROVIDE") |
| 16 |
self._pkgindex_header_keys = set(["ACCEPT_KEYWORDS", "CBUILD", |
| 17 |
"CHOST", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES", |
| 18 |
- "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EAPI", "EPREFIX"]) |
| 19 |
+ "GENTOO_MIRRORS", "INSTALL_MASK", "SYNC", "USE", "EPREFIX"]) |
| 20 |
self._pkgindex_default_pkg_data = { |
| 21 |
"DEPEND" : "", |
| 22 |
"EAPI" : "0", |
| 23 |
@@ -641,9 +641,6 @@ |
| 24 |
not self._remotepkgs: |
| 25 |
|
| 26 |
base_url = self.settings["PORTAGE_BINHOST"] |
| 27 |
- # ensure the URL ends with a /, otherwise urljoin strips off |
| 28 |
- # the last directory, before it adds "Packages" |
| 29 |
- base_url = base_url.rstrip("/") + "/" |
| 30 |
from portage.const import CACHE_PATH |
| 31 |
from urlparse import urlparse |
| 32 |
urldata = urlparse(base_url) |
Archives