diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-03-08 19:28:21 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-03-14 09:22:37 -0700 |
commit | c1fba51ccab868d05f48fcc40bc2c959c9385e76 (patch) | |
tree | 9283b979b250ad9fbcb2d3f0faa29f5769c151b9 | |
parent | 161714aa02d9deefefc2e1cf2e6ddd2e9e45f3fa (diff) | |
download | portage-c1fba51ccab868d05f48fcc40bc2c959c9385e76.tar.gz portage-c1fba51ccab868d05f48fcc40bc2c959c9385e76.tar.bz2 portage-c1fba51ccab868d05f48fcc40bc2c959c9385e76.zip |
unmerge: use vardbapi._dblink() to simplify
The dblink constructor is complex and best avoided.
-rw-r--r-- | pym/_emerge/unmerge.py | 5 |
1 files changed, 1 insertions, 4 deletions
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 |