| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-03 03:49:06 +0000 (Thu, 03 Jul 2008) |
| 3 |
New Revision: 10899 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Move post ebuild phase code (originally from spawnebuild) from |
| 9 |
EbuildExecuter.execute() to EbuildPhase._set_returncode(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-03 03:39:06 UTC (rev 10898) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-03 03:49:06 UTC (rev 10899) |
| 16 |
@@ -1863,12 +1863,6 @@ |
| 17 |
self.schedule() |
| 18 |
retval = ebuild_phase.poll() |
| 19 |
|
| 20 |
- portage._post_phase_userpriv_perms(settings) |
| 21 |
- if mydo == "install": |
| 22 |
- portage._check_build_log(settings) |
| 23 |
- if retval == os.EX_OK: |
| 24 |
- retval = portage._post_src_install_checks(settings) |
| 25 |
- |
| 26 |
if retval != os.EX_OK: |
| 27 |
return retval |
| 28 |
|
| 29 |
@@ -1993,6 +1987,14 @@ |
| 30 |
for l in wrap(msg, 72): |
| 31 |
eerror(l, phase=self.phase, key=self.pkg.cpv) |
| 32 |
|
| 33 |
+ returncode = self.returncode |
| 34 |
+ settings = self.settings |
| 35 |
+ portage._post_phase_userpriv_perms(settings) |
| 36 |
+ if self.phase == "install": |
| 37 |
+ portage._check_build_log(settings) |
| 38 |
+ if returncode == os.EX_OK: |
| 39 |
+ returncode = portage._post_src_install_checks(settings) |
| 40 |
+ |
| 41 |
class EbuildBinpkg(Task): |
| 42 |
""" |
| 43 |
This assumes that src_install() has successfully completed. |
| 44 |
|
| 45 |
-- |
| 46 |
gentoo-commits@l.g.o mailing list |
Archives