diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-12 22:34:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-12 22:34:53 +0000 |
| commit | f026e1e10ac37e6bff3192642bb822b11f1a0a95 (patch) | |
| tree | 3f563937ab8d3cf87cafc912ff7f279cf127b335 | |
| parent | 0a9c689a60d308ff38d5d63225d889fc9ddf058b (diff) | |
| download | portage-f026e1e10ac37e6bff3192642bb822b11f1a0a95.tar.gz portage-f026e1e10ac37e6bff3192642bb822b11f1a0a95.tar.bz2 portage-f026e1e10ac37e6bff3192642bb822b11f1a0a95.zip | |
Bug #195370 - Filter some more bogus matches due to
old-style virtuals.
svn path=/main/trunk/; revision=8093
| -rw-r--r-- | pym/emerge/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 645f2834f..e1fa5e4b6 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -3100,12 +3100,16 @@ class depgraph(object): #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) |