| 1 |
commit: a91c01e480288cea6ae2cfc49d5ea72803cd4724 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 3 07:48:55 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 3 07:48:55 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a91c01e4 |
| 7 |
|
| 8 |
bintree: cleanup/fix old binhost code more |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/bintree.py | 6 ++---- |
| 12 |
1 files changed, 2 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py |
| 15 |
index 6e58608..993df77 100644 |
| 16 |
--- a/pym/portage/dbapi/bintree.py |
| 17 |
+++ b/pym/portage/dbapi/bintree.py |
| 18 |
@@ -1,4 +1,4 @@ |
| 19 |
-# Copyright 1998-2010 Gentoo Foundation |
| 20 |
+# Copyright 1998-2011 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
__all__ = ["bindbapi", "binarytree"] |
| 24 |
@@ -911,13 +911,12 @@ class binarytree(object): |
| 25 |
remotepkgs = portage.getbinpkg.dir_get_metadata( |
| 26 |
base_url, chunk_size=chunk_size) |
| 27 |
|
| 28 |
- for mypkg, remote_metadata in list(remotepkgs.items()): |
| 29 |
+ for mypkg, remote_metadata in remotepkgs.items(): |
| 30 |
mycat = remote_metadata.get("CATEGORY") |
| 31 |
if mycat is None: |
| 32 |
#old-style or corrupt package |
| 33 |
writemsg(_("!!! Invalid remote binary package: %s\n") % mypkg, |
| 34 |
noiselevel=-1) |
| 35 |
- del remotepkgs[mypkg] |
| 36 |
continue |
| 37 |
mycat = mycat.strip() |
| 38 |
fullpkg = mycat+"/"+mypkg[:-5] |
| 39 |
@@ -961,7 +960,6 @@ class binarytree(object): |
| 40 |
except: |
| 41 |
writemsg(_("!!! Failed to inject remote binary package: %s\n") % fullpkg, |
| 42 |
noiselevel=-1) |
| 43 |
- del remotepkgs[mypkg] |
| 44 |
continue |
| 45 |
self.populated=1 |
Archives