| 1 |
commit: ba5814b0d747800152e87fc42a348114ff2c6145 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 2 19:23:17 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 2 23:10:48 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ba5814b0 |
| 7 |
|
| 8 |
dblink: elog failed postinst (bug 547778) |
| 9 |
|
| 10 |
This ensures that there's still an eerror elog message, even if the |
| 11 |
failed postinst did not call eerror itself. |
| 12 |
|
| 13 |
X-Gentoo-Bug: 547778 |
| 14 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=547778 |
| 15 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 16 |
|
| 17 |
pym/portage/dbapi/vartree.py | 5 +++-- |
| 18 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 21 |
index cacbf96..fca84d1 100644 |
| 22 |
--- a/pym/portage/dbapi/vartree.py |
| 23 |
+++ b/pym/portage/dbapi/vartree.py |
| 24 |
@@ -4376,8 +4376,9 @@ class dblink(object): |
| 25 |
if a != os.EX_OK: |
| 26 |
# It's stupid to bail out here, so keep going regardless of |
| 27 |
# phase return code. |
| 28 |
- showMessage(_("!!! FAILED postinst: ")+str(a)+"\n", |
| 29 |
- level=logging.ERROR, noiselevel=-1) |
| 30 |
+ self._elog("eerror", "postinst", [ |
| 31 |
+ _("FAILED postinst: %s") % (a,), |
| 32 |
+ ]) |
| 33 |
|
| 34 |
#update environment settings, library paths. DO NOT change symlinks. |
| 35 |
env_update( |
Archives