Changeset: a61d27734c9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a61d27734c9a
Modified Files:
gdk/gdk_utils.c
tools/embeddedpy/setup.py
Branch: pyapi
Log Message:
Prevent MonetDBLite from exiting Python when Ctrl+C is pressed.
diffs (34 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -256,6 +256,9 @@ BATSIGinterrupt(int nr)
static int
BATSIGinit(void)
{
+#ifdef _EMBEDDED_MONETDB_MONETDB_LIB_
+ return 0;
+#endif
/* HACK to pacify compiler */
#if (defined(__INTEL_COMPILER) && (SIZEOF_VOID_P > SIZEOF_INT))
#undef SIG_IGN /*((__sighandler_t)1 ) */
@@ -1596,7 +1599,7 @@ GDKfatal(const char *format, ...)
va_list ap;
GDKdebug |= IOMASK;
-#ifndef NATIVE_WIN32
+#ifndef NATIVE_WIN32
BATSIGinit();
#endif
if (!strncmp(format, GDKFATAL, len)) {
diff --git a/tools/embeddedpy/setup.py b/tools/embeddedpy/setup.py
--- a/tools/embeddedpy/setup.py
+++ b/tools/embeddedpy/setup.py
@@ -44,7 +44,7 @@ if os.system('./configure --prefix=' + o
print("Failed configuring MonetDB.")
exit(1)
os.system('printf \'#ifndef _EMBEDDED_MONETDB_MONETDB_LIB_\n#define
_EMBEDDED_MONETDB_MONETDB_LIB_ "%s"\n#endif\n\' | cat - monetdb_config.h >
temp.h && mv temp.h monetdb_config.h' % os.path.join(output_directory,
'lib/libmonetdb5.so'))
-if os.system('make install') != 0:
+if os.system('make clean install') != 0:
print("Failed building MonetDB.")
exit(1)
os.chdir(current_dir)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
