Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

 ChangeLog                          |    3 ++
 var/lib/sorcery/modules/libsorcery |   40 
++++++++++++++++++++-----------------
 var/lib/sorcery/modules/libstate   |    2 -
 3 files changed, 26 insertions(+), 19 deletions(-)

New commits:
commit 1e11849ea4b25a6a5945e8d7ea151c91d16848ff
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libstate: fixed a typo in the search_spell_status description

commit 9f0b39087f7417ecc3f4e63e328714310333219d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libsorcery: added a hidden switch disabling the new queing method
          (mainly for reference)

diff --git a/ChangeLog b/ChangeLog
index d6e2b7a..d4d12ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-31 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * build: fixed a typo in the pwd error message
+       * libsorcery: added a hidden switch disabling the new queing method
+         (mainly for reference)
+       * libstate: fixed a typo in the search_spell_status description
 
 2008-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * config: use $HOME instead of hardcoding /root
diff --git a/var/lib/sorcery/modules/libsorcery 
b/var/lib/sorcery/modules/libsorcery
index 7a6f3a8..3473797 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -908,6 +908,7 @@ function update_install_queue()  {
   touch $tmp_queue
 
   message  "${CHECK_COLOR}Generating the list of spells to update... 
${DEFAULT_COLOR} "
+  if [[ -z $OLD_QUEUING_METHOD ]]; then
     tablet_check_version_cache $VERSION_STATUS || return 1
     local grimoire
     for grimoire in $(codex_get_all_grimoires); do
@@ -973,24 +974,27 @@ function update_install_queue()  {
       done < $tmp_queue
       sed -i 's,^\(\S*\)\s.*$,\1,' $tmp_queue
     fi
-    if [[ -s $recheck_queue ]]; then
-      (
-        count=0
-        size=$(wc -l < $recheck_queue)
-        while read spell; do
-            progress_bar $count $size 50
-            explode "$(search_spell_status $SPELL_STATUS "$spell")" ":" 
"info"
-            curr_updated=${info[1]}
-            curr_version=${info[3]}
-            codex_set_current_spell_by_name $spell &&
-            does_spell_need_update_sub "$spell" "$curr_version" \
-                                      "$curr_updated" "$tmp_queue"
-            let count++
-        done < $recheck_queue
-        clear_line
-      )
-      rm $recheck_queue
-    fi
+  else # use the old slow method
+    get_all_spells_with_status ok > $recheck_queue
+  fi
+  if [[ -s $recheck_queue ]]; then
+    (
+      count=0
+      size=$(wc -l < $recheck_queue)
+      while read spell; do
+          progress_bar $count $size 50
+          explode "$(search_spell_status $SPELL_STATUS "$spell")" ":" "info"
+          curr_updated=${info[1]}
+          curr_version=${info[3]}
+          codex_set_current_spell_by_name $spell &&
+          does_spell_need_update_sub "$spell" "$curr_version" \
+                                    "$curr_updated" "$tmp_queue"
+          let count++
+      done < $recheck_queue
+      clear_line
+    )
+    rm $recheck_queue
+  fi
   lock_file $INSTALL_QUEUE
   rm  -f  $INSTALL_QUEUE
   sort -u $tmp_queue > $INSTALL_QUEUE
diff --git a/var/lib/sorcery/modules/libstate 
b/var/lib/sorcery/modules/libstate
index 9abc0b2..c2c2304 100755
--- a/var/lib/sorcery/modules/libstate
+++ b/var/lib/sorcery/modules/libstate
@@ -678,7 +678,7 @@ function add_spell()  {
 ## @param spell status file
 ## @param spell
 ## @param version (optional)
-## @Stdout mathing lines
+## @Stdout matching lines
 ##
 ## Arguments can be regexp
 ##