repoman: eliminate eclass_db variable
authorZac Medico <zmedico@gentoo.org>
Sat, 10 Dec 2011 20:52:07 +0000 (12:52 -0800)
committerZac Medico <zmedico@gentoo.org>
Sat, 10 Dec 2011 20:52:07 +0000 (12:52 -0800)
bin/repoman

index 43270f9e814b59f930737f4531d2afaf6c5a52cc..5924ba9ef25ab25ca122402c6cfd15e5ebc8e5d0 100755 (executable)
@@ -583,8 +583,7 @@ 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)
-eclass_db = portdb.repositories.get_repo_for_location(repodir).eclass_db
-portdb.porttrees = list(eclass_db.porttrees)
+portdb.porttrees = list(repo_config.eclass_db.porttrees)
 portdir = portdb.porttrees[0]
 
 # In order to disable manifest signatures, repos may set
@@ -672,7 +671,7 @@ logging.info('PORTDIR_OVERLAY = "%s"' % env['PORTDIR_OVERLAY'])
 env['FEATURES'] = env.get('FEATURES', '') + ' -unknown-features-warn'
 
 categories = []
-for path in eclass_db.porttrees:
+for path in repo_config.eclass_db.porttrees:
        categories.extend(portage.util.grabfile(
                os.path.join(path, 'profiles', 'categories')))
 repoman_settings.categories = frozenset(