New commits:
commit 72cae57ffe8a629186dea5d0f26bfcdcabb61a1b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
dispel: fixed bug #13904 - downgrading was incomplete, use ressurect
commit 5f49fb58875ebc652ede4cdce73763db818e4bf0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
dispel: removed EOL whitespace
diff --git a/ChangeLog b/ChangeLog
index d932a2b..b790a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
fixed bug #13466 - dispel_self was dispelling the triggerer
* dispel.8: added --total-dispel and fixed some grammar
* libgrimoire: fixed private_installed_version to match regex chars
too
+ * dispel: fixed bug #13904 - downgrading was incomplete, use ressurect
2008-01-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstate: moved the subshell from the callers into
query_spell_status and
diff --git a/usr/sbin/dispel b/usr/sbin/dispel
index 860f8fc..09b9ced 100755
--- a/usr/sbin/dispel
+++ b/usr/sbin/dispel
@@ -47,7 +47,7 @@ a more in-depth explaination refer to the manual
4 parameters:
ignore, ask-yes, ask-no, always
---orphan Default action for dispelling a newly orphaned child
+--orphan Default action for dispelling a newly orphaned child
spell.
--non-orphan Default action for dispelling a dependee of
another spell, that is not an orphan (doing this
@@ -93,7 +93,6 @@ function downgrade() {
fi
if spell_installed $SPELL; then
- previously_installed=yes
dispel_spell $SPELL
if [ $? != 0 ] ; then
message "${PROBLEM_COLOR}Unable to downgrade" \
@@ -119,33 +118,9 @@ function downgrade() {
return 1
fi
- pushd $INSTALL_ROOT/ &>/dev/null
- if [ -n "$EXTENSION" ]; then
- $COMPRESSBIN -cd $CACHE_COMP | tar -Px
- else
- tar -Pxf $CACHE_COMP
- fi
- popd &>/dev/null
+ SUCCESS_LIST=/dev/null
+ resurrect $SPELL $REQUESTED_VERSION