| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:03:30 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13482 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Use _doebuild_exit_status_check() for unsuccessful return codes (no just |
| 9 |
successful ones), since we want to be sure to produce an informative warning |
| 10 |
message whenever the shell exits unexpectedly (whether it's successful or |
| 11 |
unsuccessful). This is important since it can be makes these kinds of issues |
| 12 |
easier to diagnose (otherwise the user might blame portage, when it's really |
| 13 |
the ebuild/eclasses that is at fault). (trunk r13311) |
| 14 |
|
| 15 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
| 16 |
=================================================================== |
| 17 |
--- main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:03:06 UTC (rev 13481) |
| 18 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:03:30 UTC (rev 13482) |
| 19 |
@@ -4741,14 +4741,14 @@ |
| 20 |
if returnpid: |
| 21 |
return phase_retval |
| 22 |
|
| 23 |
- if phase_retval == os.EX_OK: |
| 24 |
- msg = _doebuild_exit_status_check(mydo, mysettings) |
| 25 |
- if msg: |
| 26 |
+ msg = _doebuild_exit_status_check(mydo, mysettings) |
| 27 |
+ if msg: |
| 28 |
+ if phase_retval == os.EX_OK: |
| 29 |
phase_retval = 1 |
| 30 |
- from textwrap import wrap |
| 31 |
- from portage.elog.messages import eerror |
| 32 |
- for l in wrap(msg, 72): |
| 33 |
- eerror(l, phase=mydo, key=mysettings.mycpv) |
| 34 |
+ from textwrap import wrap |
| 35 |
+ from portage.elog.messages import eerror |
| 36 |
+ for l in wrap(msg, 72): |
| 37 |
+ eerror(l, phase=mydo, key=mysettings.mycpv) |
| 38 |
|
| 39 |
_post_phase_userpriv_perms(mysettings) |
| 40 |
if mydo == "install": |
| 41 |
@@ -5021,14 +5021,16 @@ |
| 42 |
logfile=logfile, **kwargs) |
| 43 |
finally: |
| 44 |
pass |
| 45 |
- if rval == os.EX_OK: |
| 46 |
- msg = _doebuild_exit_status_check(mydo, mysettings) |
| 47 |
- if msg: |
| 48 |
+ |
| 49 |
+ msg = _doebuild_exit_status_check(mydo, mysettings) |
| 50 |
+ if msg: |
| 51 |
+ if rval == os.EX_OK: |
| 52 |
rval = 1 |
| 53 |
- from textwrap import wrap |
| 54 |
- from portage.elog.messages import eerror |
| 55 |
- for l in wrap(msg, 72): |
| 56 |
- eerror(l, phase=mydo, key=mysettings.mycpv) |
| 57 |
+ from textwrap import wrap |
| 58 |
+ from portage.elog.messages import eerror |
| 59 |
+ for l in wrap(msg, 72): |
| 60 |
+ eerror(l, phase=mydo, key=mysettings.mycpv) |
| 61 |
+ |
| 62 |
return rval |
| 63 |
|
| 64 |
_testing_eapis = frozenset() |
| 65 |
@@ -5567,11 +5569,10 @@ |
| 66 |
return msg |
| 67 |
|
| 68 |
def _doebuild_exit_status_check_and_log(settings, mydo, retval): |
| 69 |
- if retval != os.EX_OK: |
| 70 |
- return retval |
| 71 |
msg = _doebuild_exit_status_check(mydo, settings) |
| 72 |
if msg: |
| 73 |
- retval = 1 |
| 74 |
+ if retval == os.EX_OK: |
| 75 |
+ retval = 1 |
| 76 |
from textwrap import wrap |
| 77 |
from portage.elog.messages import eerror |
| 78 |
for l in wrap(msg, 72): |
| 79 |
@@ -5799,11 +5800,10 @@ |
| 80 |
_doebuild_manifest_cache = mf |
| 81 |
|
| 82 |
def exit_status_check(retval): |
| 83 |
- if retval != os.EX_OK: |
| 84 |
- return retval |
| 85 |
msg = _doebuild_exit_status_check(mydo, mysettings) |
| 86 |
if msg: |
| 87 |
- retval = 1 |
| 88 |
+ if retval == os.EX_OK: |
| 89 |
+ retval = 1 |
| 90 |
from textwrap import wrap |
| 91 |
from portage.elog.messages import eerror |
| 92 |
for l in wrap(msg, 72): |
Archives