bintree: clean up dict use in old binhost code

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 522967a72032fac20e41a863639182d80d02febb..33482a1d359410632d01830c0f2d00890bdeb627 100644 (file)
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -912,13 +912,14 @@ class binarytree(object):
                                base_url, chunk_size=chunk_size)
 
                        for mypkg, remote_metadata in list(remotepkgs.items()):
-                               if "CATEGORY" not in remote_metadata:
+                               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 = remotepkgs[mypkg]["CATEGORY"].strip()
+                               mycat = mycat.strip()
                                fullpkg = mycat+"/"+mypkg[:-5]
 
                                if fullpkg in metadata: