[SM-Commit] GIT changes to stable-0.47 grimoire by George Sherwood (c6a44c027a5ff750b7a96171873f772cd73962b3)

George Sherwood scm at sourcemage.org
Sun Sep 12 15:29:32 EDT 2010


GIT changes to stable-0.47 grimoire by George Sherwood <gsherwood at sourcemage.org>:

 database/sqlite/HISTORY                    |    4 ++++
 database/sqlite/PRE_SUB_DEPENDS            |    4 ++--
 database/sqlite/REPAIR^all^PRE_SUB_DEPENDS |    4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit c6a44c027a5ff750b7a96171873f772cd73962b3
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    sqlite: Fix logic in PRE_SUB_DEPENDS.  This is why sqlite was
    not getting queued when casting xulrunner
    (cherry picked from commit 895e1fe67613672eaeece37cd2c9472dd8a3e581)

diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 3875b86..ac4185c 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 George Sherwood <gsherwood at sourcemage.org>
+	PRE_SUB_DEPENDS: Fixed logic
+	REPAIR^all^PRE_SUB_DEPENDS: Fixed logic
+
 2010-09-08 Ladislav Hagara <hgr at vabo.cz>
 	* CONFIGURE, BUILD: added option SQLITE_SECURE_DELETE
 	* {,PRE_,REPAIR^all^PRE_}SUB_DEPENDS: added option SECURE_DELETE
diff --git a/database/sqlite/PRE_SUB_DEPENDS b/database/sqlite/PRE_SUB_DEPENDS
index c39acda..f19dc64 100755
--- a/database/sqlite/PRE_SUB_DEPENDS
+++ b/database/sqlite/PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
 case $THIS_SUB_DEPENDS in
        TCL) is_depends_enabled $SPELL tcl  ;;
-     TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0; fi ;;
-SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE == "y" ]]; then return 0; fi ;;
+     TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 0; fi ;;
+SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 0; fi ;;
          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
index c39acda..f19dc64 100755
--- a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
+++ b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
 case $THIS_SUB_DEPENDS in
        TCL) is_depends_enabled $SPELL tcl  ;;
-     TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0; fi ;;
-SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE == "y" ]]; then return 0; fi ;;
+     TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 0; fi ;;
+SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 0; fi ;;
          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac



More information about the SM-Commit mailing list