Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (72cae57ffe8a629186dea5d0f26bfcdcabb61a1b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (72cae57ffe8a629186dea5d0f26bfcdcabb61a1b)
  • Date: Wed, 23 Jan 2008 12:59:25 -0600

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

ChangeLog | 1 +
usr/sbin/dispel | 41 ++++++++---------------------------------
2 files changed, 9 insertions(+), 33 deletions(-)

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

- codex_set_current_spell_by_name $SPELL
-
- add_spell $SPELL installed $REQUESTED_VERSION
- if [[ $previously_installed ]] ; then
- message "${RESURRECT_COLOR}Downgraded:" \
- "${SPELL_COLOR}${SPELL}" \
- "${DEFAULT_COLOR}" \
- "to version" \
- "${VERSION_COLOR}${REQUESTED_VERSION}" \
- "${DEFAULT_COLOR}"
- else
- message "${RESURRECT_COLOR}Installed:" \
- "${SPELL_COLOR}${SPELL}" \
- "${DEFAULT_COLOR}" \
- "to version" \
- "${VERSION_COLOR}${REQUESTED_VERSION}" \
- "${DEFAULT_COLOR}"
- fi
- activity_log "cast" "$SPELL" "$REQUESTED_VERSION" "success"
return 0
}

@@ -193,7 +168,7 @@ function process_parameters() {
shift 1 ;;
--user-child-deps) validate_param "$ORPHAN_MENU_DEFAULT" ORPHAN_DEFAULT
validate_param "$NONORPHAN_MENU_DEFAULT"
NONORPHAN_DEFAULT
- shift ;;
+ shift ;;
--recast-parent) validate_param $2 RECAST_PARENT_DEFAULT
shift ;;
--dispel-parent) validate_param $2 DISPEL_PARENT_DEFAULT
@@ -202,7 +177,7 @@ function process_parameters() {
RECAST_PARENT_DEFAULT
validate_param "$DISPEL_PARENT_MENU_DEFAULT" \
DISPEL_PARENT_DEFAULT
- shift ;;
+ shift ;;
--debug-dispel) DEBUG_DISPEL=yes ; shift 1 ;;
--total-dispel) TOTAL_DISPEL=yes ; shift 1 ;;
*) help ;;
@@ -646,7 +621,7 @@ function main() {
debug dispel "SPELLS $SPELLS"
done
else
- for SPELL in $SPELLS; do
+ for SPELL in $SPELLS; do
dispel_spell_wrapper $SPELL ||
DISPEL_EXIT_STATUS=${DISPEL_EXIT_STATUS:-$?}
done
@@ -658,13 +633,13 @@ function main() {

if [ $# == 0 ]; then help | $PAGER
elif [[ $1 == -h ]] || [[ $1 == --help ]] ; then help
-elif [ "$UID" == 0 ]; then
+elif [ "$UID" == 0 ]; then
mk_tmp_dirs dispel
main "$@"
rc=$?
cleanup_tmp_dir $TMP_DIR
exit $rc
-else
+else
echo "Enter the root password, please." 1>&2
PARAMS=$(consolidate_params "$@")
su -c "$0 $PARAMS" root



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (72cae57ffe8a629186dea5d0f26bfcdcabb61a1b), Jaka Kranjc, 01/23/2008

Archive powered by MHonArc 2.6.24.

Top of Page