From 57a37fa6e1e30823b0798f34c7291eec081c1ec2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 10 Dec 2012 00:55:18 -0800 Subject: dblink._elog_process: obey phasefilter arg 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 735cf3b4d..344a4f9b4 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -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", -- cgit v1.2.3-1-g7c22