summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2010-09-12 14:28:52 -0500
committerGeorge Sherwood2010-09-12 15:51:57 -0500
commit645a5f192d798a7b52282a0d45f968a8adcb5164 (patch)
tree9b03efe45820f95c121d4b77c81278f9568301f3
parent96812aaa2a9b4b39f8913e04958cb816e9d9357d (diff)
sqlite: Fix logic in PRE_SUB_DEPENDS. This is why sqlite was
not getting queued when casting xulrunner (cherry picked from commit 895e1fe67613672eaeece37cd2c9472dd8a3e581)
-rw-r--r--database/sqlite/HISTORY4
-rwxr-xr-xdatabase/sqlite/PRE_SUB_DEPENDS4
-rwxr-xr-xdatabase/sqlite/REPAIR^all^PRE_SUB_DEPENDS4
3 files changed, 8 insertions, 4 deletions
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 3875b86a02..ac4185c524 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 George Sherwood <gsherwood@sourcemage.org>
+ PRE_SUB_DEPENDS: Fixed logic
+ REPAIR^all^PRE_SUB_DEPENDS: Fixed logic
+
2010-09-08 Ladislav Hagara <hgr@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 c39acda06f..f19dc64160 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 c39acda06f..f19dc64160 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