From f96ef8a92dfe11f92c6b4c5d9c00e098610fb54b Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 4 Oct 2006 16:18:01 +0000 Subject: [PATCH] Fix for bug #1780 - the install scripts crash. This happens in PHP when a pg_connect() connection closes. It seems to be a documented bug in PHP. It doesnt hurt the install process because it only crashes when the connection is closed, and it is only closed once the script is done. I changed the Makefile.in script to ignore these errors. --- livesupport/src/modules/archiveServer/etc/Makefile.in | 4 ++-- livesupport/src/modules/storageServer/etc/Makefile.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/livesupport/src/modules/archiveServer/etc/Makefile.in b/livesupport/src/modules/archiveServer/etc/Makefile.in index e419cf8f6..06aedf01f 100644 --- a/livesupport/src/modules/archiveServer/etc/Makefile.in +++ b/livesupport/src/modules/archiveServer/etc/Makefile.in @@ -178,10 +178,10 @@ dir_setup: ${DOXYGEN_DIR} bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} db_init: - cd var/install; php -q install.php + -cd var/install && php -q install.php db_clean: - cd var/install; php -q uninstall.php + -cd var/install && php -q uninstall.php ${TMP_DIR}: ${MKDIR} ${TMP_DIR} diff --git a/livesupport/src/modules/storageServer/etc/Makefile.in b/livesupport/src/modules/storageServer/etc/Makefile.in index 4d0df2434..9ba9e575b 100644 --- a/livesupport/src/modules/storageServer/etc/Makefile.in +++ b/livesupport/src/modules/storageServer/etc/Makefile.in @@ -209,7 +209,7 @@ endif init_database: ifeq (@INIT_LS_DATABASE@,yes) - cd ${DEST_DIR}/install && ${PHP} -q install.php + -cd ${DEST_DIR}/install && ${PHP} -q install.php endif @@ -232,10 +232,10 @@ dir_setup: ${DOXYGEN_DIR} bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} db_init: - cd var/install; php -q install.php + -cd var/install && php -q install.php db_clean: - cd var/install; php -q uninstall.php + -cd var/install && php -q uninstall.php reset: ./bin/resetStorage.sh