[SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (95f6e784d5362c14f13daf9cd94ab1af35e25fe5)

Jaka Kranjc scm at sourcemage.org
Wed Sep 3 06:55:48 EDT 2008


GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 ChangeLog                         |    5 +++++
 etc/sorcery/version               |    2 +-
 var/lib/sorcery/modules/libtablet |    2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 95f6e784d5362c14f13daf9cd94ab1af35e25fe5
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    1.14.2-rc2

commit 9943db99cfa5fda8a73dbb4735dd33c58c40c403
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libtablet: fixed broken repair file handling - a nonexisting tablet
          file caused the function to use the previous found tablet file,
          sometimes overwritting it with the new repair file
    
    (cherry-picked from commit 299080a80a1db43501b0c4a7e92c539162b7e7a9)

diff --git a/ChangeLog b/ChangeLog
index 2c3d861..249efad 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libtablet: fixed broken repair file handling - a nonexisting tablet
+	  file caused the function to use the previous found tablet file,
+	  sometimes overwritting it with the new repair file
+
 2008-09-02 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libgpg: set LC_ALL=C for commands output of which we parse #14705
 
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 999af48..a0808ab 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.2-rc1
+1.14.2-rc2
diff --git a/var/lib/sorcery/modules/libtablet b/var/lib/sorcery/modules/libtablet
index 32d4169..08729dd 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -644,6 +644,7 @@ function tablet_import_repair_files_page() {
 function tablet_check_repair_file() {
   local type=$1
   local replace=0
+  local tablet_file
 
   if ! [[ "$loaded" ]] ; then
     tablet_get_version "$page" spell_version
@@ -676,6 +677,7 @@ function tablet_check_repair_file() {
       replace=2
     fi
   fi
+
   if [[ $replace == 1 ]] ||
      { [[ $replace == 2 ]] && [[ $codex_md5 != $tablet_md5 ]] ; } ; then
     message "${MESSAGE_COLOR}Tablet Repair: replacing${DEFAULT_COLOR}"



More information about the SM-Commit mailing list