From 611268630be4349727b3bf39a1249953f04e3b7f Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 9 Dec 2011 06:51:26 +0100 Subject: Delete portage.dbapi.porttree._repo_info class and _repo_info attribute of portage.dbapi.porttree.portdbapi objects. Migrate consumers to repositories attribute of portage.dbapi.porttree.portdbapi objects. --- bin/egencache | 2 +- bin/repoman | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/egencache b/bin/egencache index 3329a07ca..ba1f18873 100755 --- a/bin/egencache +++ b/bin/egencache @@ -203,7 +203,7 @@ class GenCache(object): # findname, cp_list, and cpv_list to the desired tree. tree = portdb.porttrees[0] self._portdb = portdb - self._eclass_db = portdb._repo_info[tree].eclass_db + self._eclass_db = portdb.repositories.get_repo_for_location(tree).eclass_db self._auxdbkeys = portdb._known_keys # We can globally cleanse stale cache only if we # iterate over every single cp. diff --git a/bin/repoman b/bin/repoman index 8f42a38d0..fc5000f7e 100755 --- a/bin/repoman +++ b/bin/repoman @@ -584,8 +584,8 @@ portdb = trees[root]['porttree'].dbapi # that are specified in layout.conf. repodir = os.path.realpath(portdir_overlay) repo_config = repoman_settings.repositories.get_repo_for_location(repodir) -repo_info = portdb._repo_info[repodir] -portdb.porttrees = list(repo_info.eclass_db.porttrees) +eclass_db = portdb.repositories.get_repo_for_location(repodir).eclass_db +portdb.porttrees = list(eclass_db.porttrees) portdir = portdb.porttrees[0] # In order to disable manifest signatures, repos may set @@ -673,7 +673,7 @@ logging.info('PORTDIR_OVERLAY = "%s"' % env['PORTDIR_OVERLAY']) env['FEATURES'] = env.get('FEATURES', '') + ' -unknown-features-warn' categories = [] -for path in repo_info.eclass_db.porttrees: +for path in eclass_db.porttrees: categories.extend(portage.util.grabfile( os.path.join(path, 'profiles', 'categories'))) repoman_settings.categories = frozenset( -- cgit v1.2.3-1-g7c22