From 6b604d43c68cab45ea5668042a53c23d4012bb18 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 8 Mar 2011 19:28:21 -0800 Subject: unmerge: use vardbapi._dblink() to simplify The dblink constructor is complex and best avoided. --- pym/_emerge/unmerge.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pym/_emerge/unmerge.py') diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index a6a330cd3..68b61edc2 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -7,7 +7,6 @@ import logging import sys import textwrap import portage -import portage.dbapi.vartree from portage import os from portage.output import bold, colorize, darkgreen, green from portage._sets import SETPREFIX @@ -321,9 +320,7 @@ def unmerge(root_config, myopts, unmerge_action, msg = ("Not unmerging package %s since there is no valid reason " "for Portage to unmerge itself.") % (pkg.cpv,) skip_pkg = True - elif portage.dbapi.vartree.dblink(pkg.category, pkg.pf, - settings=settings, treetype="vartree", vartree=vartree, - scheduler=scheduler).isowner(portage._python_interpreter): + elif vartree.dbapi._dblink(cpv).isowner(portage._python_interpreter): msg = ("Not unmerging package %s since there is no valid reason " "for Portage to unmerge currently used Python interpreter.") % (pkg.cpv,) skip_pkg = True -- cgit v1.2.3-1-g7c22