From 4a516031391a94d60924b61e5799469a9602c1c4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 12 Oct 2007 22:36:05 +0000 Subject: [PATCH] Bug #195370 - Filter some more bogus matches due to old-style virtuals. (trunk r8093) svn path=/main/branches/2.1.2/; revision=8094 --- bin/emerge | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/emerge b/bin/emerge index 274f2ffbd..6ce75d5c5 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2950,12 +2950,16 @@ class depgraph: #we need to use "--emptrytree" testing here rather than "empty" param testing because "empty" #param is used for -u, where you still *do* want to see when something is being upgraded. myoldbest="" + installed_versions = vardb.match(portage.cpv_getkey(pkg_key)) if vardb.cpv_exists(pkg_key): addl=" "+yellow("R")+fetch+" " if x[3] != "nomerge": if ordered: counters.reinst += 1 - elif vardb.match(portage.dep_getkey(pkg_key)): + # filter out old-style virtual matches + elif installed_versions and \ + portage.cpv_getkey(installed_versions[0]) == \ + portage.cpv_getkey(pkg_key): mynewslot = mydbapi.aux_get(pkg_key, ["SLOT"])[0] slot_atom = "%s:%s" % \ (portage.cpv_getkey(pkg_key), mynewslot) -- 2.26.2