Make elog finalize() handling safe for PORTAGE_CONFIGROOT.

svn path=/main/trunk/; revision=6955

1 files changed, 16 insertions, 6 deletions

diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py
index 0a39b17b1..884df40c8 100644
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/pym/portage/elog/mod_mail_summary.py
@@ -8,14 +8,23 @@ from email.MIMEText import MIMEText as TextMessage
 
 _items = {}
 def process(mysettings, key, logentries, fulltext):
+	global _items
 	header = ">>> Messages generated for package %s by process %d on %s:\n\n" % \
 		(key, os.getpid(), time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time())))
-	_items[key] = header + fulltext
+	config_root = mysettings["PORTAGE_CONFIGROOT"]
+	mysettings, items = _items.setdefault(config_root, (mysettings, {}))
+	items[key] = header + fulltext
 
-def finalize(mysettings):
-	if len(_items) == 0:
+def finalize():
+	global _items
+	for mysettings, items in _items.itervalues():
+		_finalize(mysettings, items)
+	_items.clear()
+
+def _finalize(mysettings, items):
+	if len(items) == 0:
 		return
-	elif len(_items) == 1:
+	elif len(items) == 1:
 		count = "one package"
 	else:
 		count = "multiple packages"
@@ -31,10 +40,11 @@ def finalize(mysettings):
 
 	mybody = "elog messages for the following packages generated by " + \
 		"process %d on host %s:\n" % (os.getpid(), socket.getfqdn())
-	for key in _items:
+	for key in items:
 		 mybody += "- %s\n" % key
 
-	mymessage = portage.mail.create_message(myfrom, myrecipient, mysubject, mybody, attachments=_items.values())
+	mymessage = portage.mail.create_message(myfrom, myrecipient, mysubject,
+		mybody, attachments=items.values())
 	portage.mail.send_mail(mysettings, mymessage)
 
 	return