zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Do not interpret GAP library informational messages as a libgap failure.

Browse source 
Build with cryptominisat5.
Sagemath now invokes gap instead of gap_stamp.
This commit is contained in:
Jerry James 2017-11-25 14:55:31 -07:00
parent bd028da8f7
commit 6b2efc5514
2 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
sagemath-libgap.patch
View file

@ -1,6 +1,6 @@
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 2017-11-08 08:24:43.763210440 -0500
+++ src/sage/libs/gap/test/main.c 2017-11-08 08:24:46.603210549 -0500
--- src/sage/libs/gap/test/main.c.orig 2017-07-21 13:10:16.000000000 -0600
+++ src/sage/libs/gap/test/main.c 2017-11-24 10:40:06.024865775 -0700
@@ -22,7 +22,7 @@ void eval(char* cmd) {
libgap_start_interaction(cmd);
@ -11,9 +11,18 @@ diff -up src/sage/libs/gap/test/main.c.orig src/sage/libs/gap/test/main.c
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 2017-11-08 08:24:28.405209852 -0500
+++ src/sage/libs/gap/util.pyx 2017-11-08 08:24:46.603210549 -0500
@@ -160,17 +160,9 @@ def gap_root():
--- src/sage/libs/gap/util.pyx.orig 2017-07-21 13:10:16.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2017-11-24 10:41:12.757621519 -0700
@@ -22,6 +22,8 @@ from sage.interfaces.gap_workspace impor
from sage.env import SAGE_LOCAL, GAP_ROOT_DIR
from .element cimport *
+import re
+
############################################################################
### Hooking into the GAP memory management #################################
@@ -160,17 +162,9 @@ def gap_root():
sage: from sage.libs.gap.util import gap_root
sage: gap_root() # random output
@ -33,3 +42,11 @@ diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
cdef initialize():
@@ -224,6 +218,7 @@ cdef initialize():
libgap_initialize(argc, argv)
gap_error_msg = 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)