zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Limit package context to 3 lines and colorize in error output.

Browse Source
This commit is contained in:
Todd Gamblin 2017-08-05 01:04:01 -07:00
parent 4600d106e2
commit d54110d208
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/spack/spack/build_environment.py
View File

@ -60,6 +60,7 @@
from six import iteritems from six import iteritems
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.tty.color import colorize
from llnl.util.filesystem import * from llnl.util.filesystem import *
import spack import spack
@ -606,11 +607,14 @@ def child_process(child_pipe, input_stream):
return child_result return child_result
def get_package_context(traceback): def get_package_context(traceback, context=3):
"""Return some context for an error message when the build fails. """Return some context for an error message when the build fails.
Args: Args:
traceback -- A traceback from some exception raised during install. traceback (traceback): A traceback from some exception raised during
install
context (int): Lines of context to show before and after the line
where the error happened
This function inspects the stack to find where we failed in the This function inspects the stack to find where we failed in the
package file, and it adds detailed context to the long_message package file, and it adds detailed context to the long_message
@ -646,9 +650,17 @@ def make_stack(tb, stack=None):
# Build a message showing context in the install method. # Build a message showing context in the install method.
sourcelines, start = inspect.getsourcelines(frame) sourcelines, start = inspect.getsourcelines(frame)
l = frame.f_lineno - start
start_ctx = max(0, l - context)
sourcelines = sourcelines[start_ctx:l + context + 1]
for i, line in enumerate(sourcelines): for i, line in enumerate(sourcelines):
mark = ">> " if start + i == frame.f_lineno else " " is_error = start_ctx + i == l
lines.append(" %s%-5d%s" % (mark, start + i, line.rstrip())) mark = ">> " if is_error else " "
marked = " %s%-5d%s" % (mark, start_ctx + i, line.rstrip())
if is_error:
marked = colorize('@R{%s}' % marked)
lines.append(marked)
return lines return lines