diff options
| author | David James <davidjames@google.com> | 2011-01-26 14:45:43 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-02 15:10:58 -0800 |
| commit | 8e2fd1be46fb4c20365f9198e7a814ade4e37efc (patch) | |
| tree | 42a00cc31bb49e23cc450ea4b4e052968898c246 /pym/_emerge | |
| parent | c4583cc37a2c48aeecc39f4338dfaad1c88d6dea (diff) | |
| download | portage-8e2fd1be46fb4c20365f9198e7a814ade4e37efc.tar.gz portage-8e2fd1be46fb4c20365f9198e7a814ade4e37efc.tar.bz2 portage-8e2fd1be46fb4c20365f9198e7a814ade4e37efc.zip | |
Update Portage to support multiple binhosts.
BUG=chromium-os:11295
TEST=Build x86-mario with multiple binhosts (board binhost, preflight binhost)
and verify that binaries are picked up from both binhosts. Also verify
that if one of the binhosts fails, the other binhost is used correctly.
Review URL: http://codereview.chromium.org/6329022
Change-Id: I095f28c82e3effbc25105af6ac89e42c335e6381
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/BinpkgFetcher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index 942bcdf70..221d9a7ff 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -57,8 +57,8 @@ class BinpkgFetcher(SpawnProcess): rel_uri = bintree._remotepkgs[pkg.cpv].get("PATH") if not rel_uri: rel_uri = pkg.cpv + ".tbz2" - uri = bintree._remote_base_uri.rstrip("/") + \ - "/" + rel_uri.lstrip("/") + remote_base_uri = bintree._remotepkgs[pkg.cpv]["BASE_URI"] + uri = remote_base_uri.rstrip("/") + "/" + rel_uri.lstrip("/") else: uri = settings["PORTAGE_BINHOST"].rstrip("/") + \ "/" + pkg.pf + ".tbz2" |