diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-27 01:38:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-27 01:38:36 +0000 |
| commit | 7a3de7b22f6f4a4b65901cdba451744e07fc421d (patch) | |
| tree | 6d2f996a98c84ef86321b3a1cf878f830072f1c9 /bin/emerge | |
| parent | 34cf462e0d79346009462508acfb0a269300ea3a (diff) | |
| download | portage-7a3de7b22f6f4a4b65901cdba451744e07fc421d.tar.gz portage-7a3de7b22f6f4a4b65901cdba451744e07fc421d.tar.bz2 portage-7a3de7b22f6f4a4b65901cdba451744e07fc421d.zip | |
Send the ebuild die message through eerror and make sure that elog_process() gets called when an ebuild dies. This makes the elog echo module display the die message last in case other elog messages push the original die message off of the top of the screen. (trunk r7047)
svn path=/main/branches/2.1.2/; revision=7049
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 5aa826c93..5d75db69b 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3192,7 +3192,8 @@ class MergeTask(object): retval = portage.doebuild(y, "package", myroot, pkgsettings, self.edebug, mydbapi=portdb, tree="porttree") - if "--buildpkgonly" in self.myopts: + if retval != os.EX_OK or \ + "--buildpkgonly" in self.myopts: portage.elog_process(pkg_key, pkgsettings) if retval != os.EX_OK: return retval |