summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-12-10 00:55:18 -0800
committerZac Medico <zmedico@gentoo.org>2012-12-10 00:55:18 -0800
commit57a37fa6e1e30823b0798f34c7291eec081c1ec2 (patch)
tree618e961bee9395e633f147415a11b8f938e053c9
parentdb157a4096dac7a7028357c7f1b5ae5c05eb82ae (diff)
downloadportage-57a37fa6e1e30823b0798f34c7291eec081c1ec2.tar.gz
portage-57a37fa6e1e30823b0798f34c7291eec081c1ec2.tar.bz2
portage-57a37fa6e1e30823b0798f34c7291eec081c1ec2.zip
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.
-rw-r--r--pym/portage/dbapi/vartree.py5
1 files changed, 4 insertions, 1 deletions
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",