diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-24 20:36:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-24 20:36:52 +0000 |
| commit | e116b49c496e070265b8920314218cf8f2e80ff5 (patch) | |
| tree | fb7384b0998c137dd39d6a853a3bd7e1fc5f6933 /pym | |
| parent | 7be715fce4e922e0b257ff8824f7d575c4d8e3e4 (diff) | |
| download | portage-e116b49c496e070265b8920314218cf8f2e80ff5.tar.gz portage-e116b49c496e070265b8920314218cf8f2e80ff5.tar.bz2 portage-e116b49c496e070265b8920314218cf8f2e80ff5.zip | |
Fix broken base_uri handling for old-style binhosts in binarytree.gettbz2().
svn path=/main/trunk/; revision=7002
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 1930bc71d..a2ce78b0c 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -857,16 +857,15 @@ class binarytree(object): except (OSError, IOError): pass from urlparse import urljoin - base_url = self._remote_base_uri fcmd = self.settings["RESUMECOMMAND"] if self._remote_has_index: rel_url = self._remotepkgs[pkgname].get("PATH") if not rel_url: rel_url = pkgname+".tbz2" - url = urljoin(base_url, rel_url) + url = urljoin(self._remote_base_uri, rel_url) success = portage.getbinpkg.file_get(url, mydest, fcmd=fcmd) else: - url = urljoin(base_url, tbz2name) + url = urljoin(self.settings["PORTAGE_BINHOST"], tbz2name) success = portage.getbinpkg.file_get(url, mydest, fcmd=fcmd) if success and "strict" in self.settings.features: metadata = self._remotepkgs[pkgname] |