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

Jaka Kranjc scm at sourcemage.org
Sun Jun 8 12:15:43 EDT 2008


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

 ChangeLog                        |    6 ++++++
 usr/sbin/sorcery                 |    1 -
 var/lib/sorcery/modules/libcodex |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

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

    sorcery: removed a useless variable, a relic from the days when sorcery
          was a spell itself

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

    libcodex: fixed an ancient minibug in codex_check_cache - the error
          message was printing the wrong variable
    
    it was already present when the cvs import happened

diff --git a/ChangeLog b/ChangeLog
index d4d12ad..1455e16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-07 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libcodex: fixed an ancient minibug in codex_check_cache - the error
+	  message was printing the wrong variable
+	* sorcery: removed a useless variable, a relic from the days when sorcery
+	  was a spell itself
+
 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
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 2860217..8fadec8 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -1940,7 +1940,6 @@ if  [  "$UID"  ==  0  ];  then
   DIALOG='$DIALOGPROG  --backtitle "Sorcery Spell Management Utility" --stdout'
 
   SORCERY_VERSION=`cat /etc/sorcery/version`
-  SORCERY_DIR=`codex_find_spell_by_name  sorcery-$SORCERY_BRANCH`
   mk_tmp_dirs sorcery
   main  "$@"
   rc=$?
diff --git a/var/lib/sorcery/modules/libcodex b/var/lib/sorcery/modules/libcodex
index 051231e..988865d 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -836,7 +836,7 @@ function codex_check_cache()  {
       codex_create_cache
   fi
   if ! [ -f $1/$SPELL_INDEX_FILE ] || ! [ -f $1/$PROVIDE_INDEX_FILE ]; then
-    message "${PROBLEM_COLOR}Eeek, $2 is not a grimoire!${DEFAULT_COLOR}" >&2
+    error_message "${PROBLEM_COLOR}Eeek, $1 is not a grimoire!${DEFAULT_COLOR}"
     exit 1
   fi
 }



More information about the SM-Commit mailing list