Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (cb893b6314b9853fde76f21b6625c7a55d910bcf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (cb893b6314b9853fde76f21b6625c7a55d910bcf)
  • Date: Tue, 12 Jan 2010 15:45:48 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

database/db/HISTORY | 18 +++++++++++++-----
database/db/PREPARE | 12 +++++++-----
2 files changed, 20 insertions(+), 10 deletions(-)

New commits:
commit cb893b6314b9853fde76f21b6625c7a55d910bcf
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

db: Cleanup warning message

commit da6828db47edea7270085f3297a7f70661296fc0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

db: Do not print ok if all db branch check passes

commit 1678bbb6c7e75b29e22e0a5637eced2a42b6fea4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

db: Cleanup formatting

commit 2acbb182e93d74c4b4b3f2bd984378f8a700f5f0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

db: Fix date in HISTORY

commit 3700903e49f7cd9473c4f0cd98f1a95d5bd36d1c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

db: PREPARE is run before DETAILS, need to obtain VERSION elsewise
Format change is only between 4.8 and 4.7 so only check branch
4.x
May not need this for 4.8 -> 4.9
Fixes Bug #15543

diff --git a/database/db/HISTORY b/database/db/HISTORY
index e1096fb..77c44df 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,4 +1,12 @@
-2009-0-30 Treeve Jelbert <treeve AT sourcemage.org>
+2010-01-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PREPARE: PREPARE is run before DETAILS, need to obtain VERSION
elsewise
+ Format change is only between 4.8 and 4.7 so only check branch 4.x
+ May not need this for 4.8 -> 4.9
+ Fixes Bug #15543
+ Do not print "ok" if all db branch check passes
+ Cleanup warning message
+
+2009-09-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.8.24
* PREPARE: added, to warn that the format of the logfile has changed

@@ -40,8 +48,8 @@
* DETAILS: (automated) Add KEYWORDS

2006-02-10 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated SHA512. Some data changed in license files
- with no version update. Removed CCACHE and DISTCC.
+ * DETAILS: Updated SHA512. Some data changed in license files
+ with no version update. Removed CCACHE and DISTCC.

2006-02-03 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 4.4.20
@@ -188,8 +196,8 @@
* DETAILS: Bug #3904

2003-07-08 hgg <hgreig AT bigpond.net.au>
- * CONFIGURE,DEPENDS,BUILD: Alter CONFIGURE/DEPENDS/BUILD to support
java and allow permanent configuration
- (until cast -r is called)
+ * CONFIGURE,DEPENDS,BUILD: Alter CONFIGURE/DEPENDS/BUILD to support
java and allow permanent
+ configuration (until cast -r is called)

2003-06-19 Seth Woolley <seth AT tautology.org>
* BUILD: unpack on the previous patch 1 from sleepycat for md5 in
BUILD.
diff --git a/database/db/PREPARE b/database/db/PREPARE
index be935c6..e8f6d5f 100755
--- a/database/db/PREPARE
+++ b/database/db/PREPARE
@@ -1,10 +1,12 @@
-if spell_ok db;then
- if [[ `installed_version db` != $VERSION ]];then
- if ! query 'the log file format has changed! continue?' n;then
- message failed
+local OLD_BRANCH=$(installed_version db|cut -d. -f1,2|sed 's:\.::') &&
+local CURRENT_BRANCH=$(gaze version $SPELL | awk 'NR == 3 {print $4}'|cut
-d. -f1,2|sed 's:\.::')
+
+if spell_ok db;then
+ if [[ "$OLD_BRANCH" != "$CURRENT_BRANCH" ]]; then
+ if ! query 'Log file format has changed! Continue?' n;then
+ message "${PROBLEM_COLOR}Log format has changed and you need to affirm
you are ready${DEFAULT_COLOR}" &&
return 1
fi
fi
fi
-message ok
return 0



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (cb893b6314b9853fde76f21b6625c7a55d910bcf), Eric Sandall, 01/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page