| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-24 21:37:30 +0000 (Mon, 24 Aug 2009) |
| 3 |
New Revision: 14154 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/Scheduler.py |
| 7 |
Log: |
| 8 |
Show log paths when displaying the list of failed packages for --keep-going. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/Scheduler.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/Scheduler.py 2009-08-24 10:18:57 UTC (rev 14153) |
| 14 |
+++ main/trunk/pym/_emerge/Scheduler.py 2009-08-24 21:37:30 UTC (rev 14154) |
| 15 |
@@ -857,6 +857,7 @@ |
| 16 |
self._failed_pkgs_all.extend(failed_pkgs) |
| 17 |
del failed_pkgs[:] |
| 18 |
|
| 19 |
+ printer = portage.output.EOutput() |
| 20 |
background = self._background |
| 21 |
failure_log_shown = False |
| 22 |
if background and len(self._failed_pkgs_all) == 1: |
| 23 |
@@ -895,7 +896,6 @@ |
| 24 |
self._failed_pkgs_die_msgs and \ |
| 25 |
not mod_echo_output: |
| 26 |
|
| 27 |
- printer = portage.output.EOutput() |
| 28 |
for mysettings, key, logentries in self._failed_pkgs_die_msgs: |
| 29 |
root_msg = "" |
| 30 |
if mysettings["ROOT"] != "/": |
| 31 |
@@ -926,17 +926,20 @@ |
| 32 |
else: |
| 33 |
msg = "The following package has " + \ |
| 34 |
"failed to build or install:" |
| 35 |
- prefix = bad(" * ") |
| 36 |
- writemsg(prefix + "\n", noiselevel=-1) |
| 37 |
- from textwrap import wrap |
| 38 |
- for line in wrap(msg, 72): |
| 39 |
- writemsg("%s%s\n" % (prefix, line), noiselevel=-1) |
| 40 |
- writemsg(prefix + "\n", noiselevel=-1) |
| 41 |
+ |
| 42 |
+ printer.eerror("") |
| 43 |
+ for line in textwrap.wrap(msg, 72): |
| 44 |
+ printer.eerror(line) |
| 45 |
+ printer.eerror("") |
| 46 |
for failed_pkg in self._failed_pkgs_all: |
| 47 |
- writemsg("%s\t%s\n" % (prefix, |
| 48 |
- colorize("INFORM", str(failed_pkg.pkg))), |
| 49 |
- noiselevel=-1) |
| 50 |
- writemsg(prefix + "\n", noiselevel=-1) |
| 51 |
+ msg = " %s" % (colorize('INFORM', failed_pkg.pkg.__str__()),) |
| 52 |
+ log_path = self._locate_failure_log(failed_pkg) |
| 53 |
+ if log_path is not None: |
| 54 |
+ msg += ", Log file:" |
| 55 |
+ printer.eerror(msg) |
| 56 |
+ if log_path is not None: |
| 57 |
+ printer.eerror(" '%s'" % colorize('INFORM', log_path)) |
| 58 |
+ printer.eerror("") |
| 59 |
|
| 60 |
if self._failed_pkgs_all: |
| 61 |
return 1 |
Archives