From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 3 Feb 2011 07:48:55 +0000 (-0800)
Subject: bintree: cleanup/fix old binhost code more
X-Git-Tag: v2.1.9.36~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59d34263f22b61c285e4b4c0e00ce1dfaa24e4ce;p=portage.git

bintree: cleanup/fix old binhost code more
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 33482a1d3..c424d1642 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -1,4 +1,4 @@
-# Copyright 1998-2010 Gentoo Foundation
+# Copyright 1998-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = ["bindbapi", "binarytree"]
@@ -911,13 +911,12 @@ class binarytree(object):
 			remotepkgs = portage.getbinpkg.dir_get_metadata(
 				base_url, chunk_size=chunk_size)
 
-			for mypkg, remote_metadata in list(remotepkgs.items()):
+			for mypkg, remote_metadata in remotepkgs.items():
 				mycat = remote_metadata.get("CATEGORY")
 				if mycat is None:
 					#old-style or corrupt package
 					writemsg(_("!!! Invalid remote binary package: %s\n") % mypkg,
 						noiselevel=-1)
-					del remotepkgs[mypkg]
 					continue
 				mycat = mycat.strip()
 				fullpkg = mycat+"/"+mypkg[:-5]
@@ -961,7 +960,6 @@ class binarytree(object):
 				except:
 					writemsg(_("!!! Failed to inject remote binary package: %s\n") % fullpkg,
 						noiselevel=-1)
-					del remotepkgs[mypkg]
 					continue
 		self.populated=1