dblink._elog_process: obey phasefilter arg
authorZac Medico <zmedico@gentoo.org>
Mon, 10 Dec 2012 08:55:18 +0000 (00:55 -0800)
committerZac Medico <zmedico@gentoo.org>
Mon, 10 Dec 2012 08:55:18 +0000 (00:55 -0800)
This would make a difference when collecting messages for prerm/postrm
when uninstalling the previous instance of a package that's been
updated.

pym/portage/dbapi/vartree.py

index 735cf3b4d6088f02cfd6292edf3739549b957fec..344a4f9b4439202c17dcd6224988645001147866 100644 (file)
@@ -3436,7 +3436,10 @@ class dblink(object):
                else:
                        logdir = os.path.join(self.settings["T"], "logging")
                        ebuild_logentries = collect_ebuild_messages(logdir)
-                       py_logentries = collect_messages(key=cpv).get(cpv, {})
+                       # phasefilter is irrelevant for the above collect_ebuild_messages
+                       # call, since this package instance has a private logdir. However,
+                       # it may be relevant for the following collect_messages call.
+                       py_logentries = collect_messages(key=cpv, phasefilter=phasefilter).get(cpv, {})
                        logentries = _merge_logentries(py_logentries, ebuild_logentries)
                        funcnames = {
                                "INFO": "einfo",