diff -up src/sage/env.py.orig src/sage/env.py --- src/sage/env.py.orig 2018-12-22 16:37:08.000000000 -0700 +++ src/sage/env.py 2019-01-04 11:08:22.825475344 -0700 @@ -164,7 +164,7 @@ _add_variable_or_fallback('CONWAY_POLYNO _add_variable_or_fallback('GRAPHS_DATA_DIR', opj('$SAGE_SHARE','graphs')) _add_variable_or_fallback('ELLCURVE_DATA_DIR',opj('$SAGE_SHARE','ellcurves')) _add_variable_or_fallback('POLYTOPE_DATA_DIR',opj('$SAGE_SHARE','reflexive_polytopes')) -_add_variable_or_fallback('GAP_ROOT_DIR', opj('$SAGE_LOCAL','gap','latest')) +_add_variable_or_fallback('GAP_ROOT_DIR', opj('/usr','lib','gap')) _add_variable_or_fallback('THEBE_DIR', opj('$SAGE_SHARE','thebe')) _add_variable_or_fallback('COMBINATORIAL_DESIGN_DATA_DIR', opj('$SAGE_SHARE', 'combinatorial_designs')) _add_variable_or_fallback('CREMONA_MINI_DATA_DIR', opj('$SAGE_SHARE', 'cremona')) diff -up src/sage/libs/gap/test/main.c.orig src/sage/libs/gap/test/main.c --- src/sage/libs/gap/test/main.c.orig 2018-12-22 16:37:08.000000000 -0700 +++ src/sage/libs/gap/test/main.c 2019-01-04 11:08:22.842475024 -0700 @@ -22,7 +22,7 @@ void eval(char* cmd) { libgap_start_interaction(cmd); libgap_enter(); - libGAP_ReadEvalCommand(libGAP_BottomLVars); + libGAP_ReadEvalCommand(libGAP_BottomLVars, NULL); libGAP_ViewObjHandler(libGAP_ReadEvalResult); char* out = libgap_get_output(); libgap_exit(); diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx --- src/sage/libs/gap/util.pyx.orig 2018-12-22 16:37:08.000000000 -0700 +++ src/sage/libs/gap/util.pyx 2019-01-04 11:08:22.843475005 -0700 @@ -27,6 +27,8 @@ from sage.cpython.string cimport str_to_ from sage.interfaces.gap_workspace import prepare_workspace_dir from sage.env import SAGE_LOCAL, GAP_ROOT_DIR +import re + ############################################################################ ### Hooking into the GAP memory management ################################# @@ -185,7 +187,7 @@ def gap_root(): sage: from sage.libs.gap.util import gap_root sage: gap_root() # random output - '/home/vbraun/opt/sage-5.3.rc0/local/gap/latest' + '/usr/lib/gap' """ try: if os.path.exists(GAP_ROOT_DIR): @@ -251,6 +253,7 @@ cdef initialize(): libgap_initialize(argc, argv) gap_error_msg = char_to_str(libgap_get_output()) libgap_finish_interaction() + gap_error_msg = re.sub(r'#I.*\n?', '', gap_error_msg, flags=re.MULTILINE) if gap_error_msg: raise RuntimeError('libGAP initialization failed\n' + gap_error_msg)