summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-30 21:19:19 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-30 21:19:19 +0000
commit0cc7d78dcd29bb76fa415bf7047e3c9a8e01bce2 (patch)
tree4bb2ea7d0dad6f7d729cd0a3067e3ba77c6ac5ae
parentae7c864fbbc463f871af671bc80354d4c0d2ed02 (diff)
downloadportage-0cc7d78dcd29bb76fa415bf7047e3c9a8e01bce2.tar.gz
portage-0cc7d78dcd29bb76fa415bf7047e3c9a8e01bce2.tar.bz2
portage-0cc7d78dcd29bb76fa415bf7047e3c9a8e01bce2.zip
Make finalize() accept a parameter once again since older versions of portage import elog modules from newer versions of portage when they upgrade themselves.
svn path=/main/trunk/; revision=7522
-rw-r--r--pym/portage/elog/mod_echo.py5
-rw-r--r--pym/portage/elog/mod_mail_summary.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/pym/portage/elog/mod_echo.py b/pym/portage/elog/mod_echo.py
index 9ae6fcf6c..e9bd4bd38 100644
--- a/pym/portage/elog/mod_echo.py
+++ b/pym/portage/elog/mod_echo.py
@@ -11,7 +11,10 @@ def process(mysettings, key, logentries, fulltext):
global _items
_items.append((mysettings, key, logentries))
-def finalize():
+def finalize(mysettings=None):
+ """The mysettings parameter is just for backward compatibility since
+ an older version of portage will import the module from a newer version
+ when it upgrades itself."""
global _items
printer = EOutput()
for mysettings, key, logentries in _items:
diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py
index 884df40c8..7410f05af 100644
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/pym/portage/elog/mod_mail_summary.py
@@ -15,7 +15,10 @@ def process(mysettings, key, logentries, fulltext):
mysettings, items = _items.setdefault(config_root, (mysettings, {}))
items[key] = header + fulltext
-def finalize():
+def finalize(mysettings=None):
+ """The mysettings parameter is just for backward compatibility since
+ an older version of portage will import the module from a newer version
+ when it upgrades itself."""
global _items
for mysettings, items in _items.itervalues():
_finalize(mysettings, items)