aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-02-02 21:51:19 -0800
committerZac Medico <zmedico@gentoo.org>2011-02-02 21:51:19 -0800
commit0bf4d79c8ad483c3c8a65210eb2af27e41f52714 (patch)
tree20b146ad153df4820eecc5b3419029028cd71fa8 /pym/portage/dbapi/bintree.py
parentdepgraph: remove obsolete gpg exception handlers (diff)
downloadportage-0bf4d79c8ad483c3c8a65210eb2af27e41f52714.tar.gz
portage-0bf4d79c8ad483c3c8a65210eb2af27e41f52714.tar.bz2
portage-0bf4d79c8ad483c3c8a65210eb2af27e41f52714.zip
bintree: remove unused __remotepkgs
Diffstat (limited to 'pym/portage/dbapi/bintree.py')
-rw-r--r--pym/portage/dbapi/bintree.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 254ed021d..a9c614d8a 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -225,7 +225,6 @@ class binarytree(object):
self.tree = {}
self._remote_has_index = False
self._remotepkgs = None # remote metadata indexed by cpv
- self.__remotepkgs = {} # indexed by tbz2 name (deprecated)
self.invalids = []
self.settings = settings
self._pkg_paths = {}
@@ -731,7 +730,6 @@ class binarytree(object):
self.populated=1
return
self._remotepkgs = {}
- self.__remotepkgs = {}
for base_url in self.settings["PORTAGE_BINHOST"].split():
parsed_url = urlparse(base_url)
host = parsed_url.netloc
@@ -912,17 +910,15 @@ class binarytree(object):
re.sub(r'//(.+):.+@(.+)/', r'//\1:*password*@\2/', base_url) + "\n")
remotepkgs = portage.getbinpkg.dir_get_metadata(
base_url, chunk_size=chunk_size)
- self.__remotepkgs.update(remotepkgs)
- #writemsg(green(" -- DONE!\n\n"))
- for mypkg in list(remotepkgs):
- if "CATEGORY" not in self.__remotepkgs[mypkg]:
+ for mypkg, remote_metadata in list(remotepkgs.items()):
+ if "CATEGORY" not in remote_metadata:
#old-style or corrupt package
writemsg(_("!!! Invalid remote binary package: %s\n") % mypkg,
noiselevel=-1)
- del self.__remotepkgs[mypkg]
+ del remotepkgs[mypkg]
continue
- mycat = self.__remotepkgs[mypkg]["CATEGORY"].strip()
+ mycat = remotepkgs[mypkg]["CATEGORY"].strip()
fullpkg = mycat+"/"+mypkg[:-5]
if fullpkg in metadata:
@@ -944,7 +940,6 @@ class binarytree(object):
try:
# invalid tbz2's can hurt things.
self.dbapi.cpv_inject(fullpkg)
- remote_metadata = self.__remotepkgs[mypkg]
for k, v in remote_metadata.items():
remote_metadata[k] = v.strip()
remote_metadata["BASE_URI"] = base_url
@@ -965,7 +960,7 @@ class binarytree(object):
except:
writemsg(_("!!! Failed to inject remote binary package: %s\n") % fullpkg,
noiselevel=-1)
- del self.__remotepkgs[mypkg]
+ remotepkgs[mypkg]
continue
self.populated=1