sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (efb8d76897f1016c5e62c4fa57a9dba0e47dfa2e)
- From: Jaka Kranjc <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (efb8d76897f1016c5e62c4fa57a9dba0e47dfa2e)
- Date: Fri, 14 Mar 2008 11:55:43 -0500
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 5 +++++
var/lib/sorcery/modules/libresurrect | 6 ++++--
var/lib/sorcery/modules/libsecurity | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit efb8d76897f1016c5e62c4fa57a9dba0e47dfa2e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libsecurity: don't use a hardcoded path in gaze_checkmd5s
* libresurrect: unset the var, not its contents
added a commented out fix to get post-ressurect triggers working
further
diff --git a/ChangeLog b/ChangeLog
index 12e2731..5639189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsecurity: don't use a hardcoded path in gaze_checkmd5s
+ * libresurrect: unset the var, not its contents
+ added a commented out fix to get post-ressurect triggers working
further
+
2008-03-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* scribbler: fixed message when scribbling from a missing grimoire
#14353
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index c854820..f451004 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -202,7 +202,7 @@ function resurrect() { (
tablet_get_grimoire_filter "$OLD_TABLET_DIR" configs
SECTION_CONFIG_FILTER
tablet_get_section_filter "$OLD_TABLET_DIR" configs
GRIMOIRE_CONFIG_FILTER
else
- unset $OLD_TABLET_DIR
+ unset OLD_TABLET_DIR
debug "libresurrect" "no tablet"
codex_set_current_spell_by_name $SPELL
SPELL_CONFIG_FILTER=$SCRIPT_DIRECTORY/configs
@@ -300,7 +300,9 @@ function resurrect() { (
#cleanse --fix $SILENT $SPELL
# n) run triggers
- #run_triggers
+ #TABLET_PATH=$STATE_DIRECTORY/tablet # reset to default, was relative
+ #SPELL_CONFIG="$DEPENDS_CONFIG/$SPELL"
+ #run_triggers # doesn't work since the spell isn't installed yet
return 0
) }
diff --git a/var/lib/sorcery/modules/libsecurity
b/var/lib/sorcery/modules/libsecurity
index c5a035e..92201e2 100755
--- a/var/lib/sorcery/modules/libsecurity
+++ b/var/lib/sorcery/modules/libsecurity
@@ -236,8 +236,8 @@ function gaze_checkmd5s() {
unset SOURCE
unset MD5 2> /dev/null
unset LICENSE 2> /dev/null
- SPELL_CONFIG=/etc/sorcery/local/depends/$spellname
- #echo $SPELL_CONFIG
+ SPELL_CONFIG=$DEPENDS_CONFIG/$spellname
+
source $spellpath > /dev/null 2> /dev/null
gaze_checkmd5 $spellroot ''
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (efb8d76897f1016c5e62c4fa57a9dba0e47dfa2e), Jaka Kranjc, 03/14/2008
Archive powered by MHonArc 2.6.24.