Source Mage code commit list

[David Brown <scm AT mail.sourcemage.org>]

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

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

New commits:
commit 0f5d3ba298af1f24d3943d435cab659c9a7b7da7
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

    libsorcery fixed query to also include the the check for cleanse

diff --git a/ChangeLog b/ChangeLog
index 327906a..f4232b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2006-07-01 David Brown <dmlb2000 AT gmail.com>
+       * libsorcery: fixed query from previous commit to include a check for
+         cleanse as well
+
+2006-07-01 David Brown <dmlb2000 AT gmail.com>
        * libsorcery: added query to update_sorcery_scripts to check return
          value from cast and ask user if they want to continue
 
diff --git a/var/lib/sorcery/modules/libsorcery 
b/var/lib/sorcery/modules/libsorcery
index 6be7ac7..b01fff7 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -31,17 +31,16 @@ function update_sorcery_scripts() {
     if [[ `codex_find_spell_by_name basesystem` ]] ; then
       if ! spell_ok basesystem  ; then
         cast basesystem
-      fi 
-      if [[ $? != 0 ]]
-      then
+      fi &&
+      if [[ "$UPDATEFIX" == on ]] ; then
+        cleanse --fix basesystem
+      fi
+      if [[ $? != 0 ]] ; then
         if ! query "Would you like to continue anyway?" y
         then
           return 1
         fi
       fi
-      if [ "$UPDATEFIX" == on ] ; then
-        cleanse --fix basesystem
-      fi
     fi
   }