New commits:
commit 8254f1d63fefdedfc7b4db20d5507148c7623dbe
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libressurect: always use the saved version after setting the spell
diff --git a/ChangeLog b/ChangeLog
index 007c761..f4cf4e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-04-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libressurect: always use the saved version after setting the spell
+
2008-04-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libressurect, libgpg: fixed some comments and error messages
* libressurect: fallback to the variable's contents, not its name if
the
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index c977e81..fbbe242 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -201,8 +201,10 @@ function resurrect() { (
fi
local CONFIG_FILTERS="$GRIMOIRE_CONFIG_FILTER $SECTION_CONFIG_FILTER
$SPELL_CONFIG_FILTER"
# loading the spell may give us a different version which we dont want
- # TODO: check if the below line should be inversed wrt the previous comment
- VERSION=${VERSION:-$TMP_VERSION}
+ if [[ $VERSION != $TMP_VERSION ]]; then
+ debug "libresurrect" "restoring VERSION from $VERSION to $TMP_VERSION"
+ fi
+ VERSION=$TMP_VERSION
# 6) find the cache's install log and divide it up every way imaginable
if ! [[ $OLD_TABLET_DIR ]] ; then
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (8254f1d63fefdedfc7b4db20d5507148c7623dbe),
Jaka Kranjc, 04/11/2008