From 1a693adbc6ea559e92f88268c0d5b3d54c0f7c06 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 8 May 2011 23:08:43 -0700 Subject: unmerge: skip getvirtuals() if cat is not virtual This allows us to avoid triggering the old-style virtual code which scans /var/db/pkg/*/*/PROVIDE. --- pym/_emerge/unmerge.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pym/_emerge/unmerge.py') diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index 7e66ff9fb..6c0ef8dbc 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -67,8 +67,14 @@ def unmerge(root_config, myopts, unmerge_action, syslist = [] for x in realsyslist: - mycp = portage.dep_getkey(x) - if mycp in settings.getvirtuals(): + mycp = x.cp + # Since Gentoo stopped using old-style virtuals in + # 2011, typically it's possible to avoid getvirtuals() + # calls entirely. It will not be triggered here by + # new-style virtuals since those are expanded to + # non-virtual atoms above by expand_new_virt(). + if mycp.startswith("virtual/") and \ + mycp in settings.getvirtuals(): providers = [] for provider in settings.getvirtuals()[mycp]: if vartree.dbapi.match(provider): -- cgit v1.2.3-1-g7c22