From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 20 Dec 2007 06:00:10 +0000 (-0000)
Subject: Make binarytree.populate() stop relying on having a categories
X-Git-Tag: v2.2_pre1~152
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8e5d17d872d70b893377f0ef2529151415875ff;p=portage.git

Make binarytree.populate() stop relying on having a categories
list since it may not be available if there is no portage tree.

svn path=/main/trunk/; revision=8975
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index b354f9aee..c3c514a4e 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -358,8 +358,6 @@ class binarytree(object):
 		if (not os.path.isdir(self.pkgdir) and not getbinpkgs):
 			return 0
 
-		categories = set(self.settings.categories)
-
 		if not getbinpkgsonly:
 			pkg_paths = {}
 			self._pkg_paths = pkg_paths
@@ -496,7 +494,7 @@ class binarytree(object):
 					if mycpv in pkg_paths:
 						# All is first, so it's preferred.
 						continue
-					if mycat not in categories:
+					if not mycat:
 						writemsg(("!!! Binary package has an " + \
 							"unrecognized category: '%s'\n") % full_path,
 							noiselevel=-1)
@@ -656,7 +654,7 @@ class binarytree(object):
 					continue
 				mycat = self.remotepkgs[mypkg]["CATEGORY"].strip()
 				fullpkg = mycat+"/"+mypkg[:-5]
-				if mycat not in categories:
+				if not mycat:
 					writemsg(("!!! Remote binary package has an " + \
 						"unrecognized category: '%s'\n") % fullpkg,
 						noiselevel=-1)