[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b96074edaa51ed121e24f870e1fa4f562a72adb7)

Jaka Kranjc scm at sourcemage.org
Thu Apr 17 11:30:23 EDT 2008


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

 ChangeLog                          |    2 +-
 var/lib/sorcery/modules/libsorcery |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

    don't queue held spells in either verbosity mode

diff --git a/ChangeLog b/ChangeLog
index 27845e2..61766b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
 	  removed an extra space in list_install_queue
 	  reformatted and sanitized list_install_queue
 	  also add held spells to the (tablet) version cache
-	  don't queue held spells
+	  don't queue held spells in either verbosity mode
 
 2008-04-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* scribe.8: don't mention local grimoires for reindex-version, nothing good
diff --git a/var/lib/sorcery/modules/libsorcery b/var/lib/sorcery/modules/libsorcery
index e0bc73b..c79dc03 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -971,7 +971,7 @@ function update_install_queue()  {
       } ' > $tmp_queue 2> $recheck_queue
     local spell
     for spell in $(get_all_spells_with_status held); do
-      sed -i "/^$spell /d" $tmp_queue $recheck_queue
+      sed -i "/^$spell\( \|$\)/d" $tmp_queue $recheck_queue
     done
     if [[ $VERBOSE_QUEUING == on ]]; then
       local message



More information about the SM-Commit mailing list