Skip to Content.
Sympa Menu

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

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 (0fe056c0e9b07494a65c0d852d753074037c1d5b)
  • Date: Fri, 18 Jul 2008 06:45:20 -0500

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

ChangeLog | 3 +++
usr/sbin/cleanse | 2 +-
usr/sbin/dispel | 3 +++
usr/share/man/man8/dispel.8 | 2 ++
var/lib/sorcery/modules/build_api/common | 2 +-
var/lib/sorcery/modules/libcast | 2 +-
var/lib/sorcery/modules/libdispel | 1 +
var/lib/sorcery/modules/libtriggers | 2 +-
8 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 0fe056c0e9b07494a65c0d852d753074037c1d5b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

dispel, libdispel, common, cleanse, libcast, libtriggers: fixed bug
#14575 - manually dispelling removes the spell from the install
queue
most internal calls pass a flag to disable that behaviour

diff --git a/ChangeLog b/ChangeLog
index a180558..0d07250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
spells, even though their logs possibly still exist
* libtablet: shortcircuit tablet_check_version_cache if the old
queuing
method is used
+ * dispel, libdispel, common, cleanse, libcast, libtriggers: fixed bug
+ #14575 - manually dispelling removes the spell from the install
queue
+ most internal calls pass a flag to disable that behaviour

2008-07-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcast: removed extraneus spaces in acquire_cast_lock messages
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 893826e..34b44bd 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -402,7 +402,7 @@ function prune_depends()
# put the spells in two files for later perusal
if [[ $action ]] ; then
[ -s $TMP_DIR/prune.dispel ] &&
- dispel $(sort -u $TMP_DIR/prune.dispel)
+ dispel --noqueue $(sort -u $TMP_DIR/prune.dispel)
[ -s $TMP_DIR/prune.cast ] &&
cast -c $(sort -u $TMP_DIR/prune.cast)
else
diff --git a/usr/sbin/dispel b/usr/sbin/dispel
index f81b4cc..490ddeb 100755
--- a/usr/sbin/dispel
+++ b/usr/sbin/dispel
@@ -38,6 +38,7 @@ Optional Parameters:

--total-dispel Remove everything including config files even
if they were modified.
+--noqueue Don't try to remove the spell from the install queue

The following parameters effect dependency following, if they are not
specified the default action is to do no dependency following. For
@@ -209,6 +210,7 @@ function process_parameters() {
shift ;;
--debug-dispel) DEBUG_DISPEL=yes ; shift 1 ;;
--total-dispel) TOTAL_DISPEL=yes ; shift 1 ;;
+ --noqueue) DEQUEUE=off; shift 1 ;;
*) help ;;
esac
else
@@ -250,6 +252,7 @@ function strip_parameters() {
--user-parent-deps) shift 1 ;;
--debug-dispel) shift 1 ;;
--total-dispel) shift 1 ;;
+ --noqueue) shift 1 ;;
*) shift 1 ;;
esac
else
diff --git a/usr/share/man/man8/dispel.8 b/usr/share/man/man8/dispel.8
index ee004b5..736bd32 100644
--- a/usr/share/man/man8/dispel.8
+++ b/usr/share/man/man8/dispel.8
@@ -88,6 +88,8 @@ Don't remove dependency information. DO NOT use this unless
you know exactly
what you are doing, and dont complain if it breaks your box.
.SS "--total-dispel"
Remove everything including config files, even if they were modified.
+.SS "--noqueue"
+Don't try to remove the spell from the install queue

.SS "--orphan <quad-opt>"
Default action for dispelling a newly orphaned child spell.
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 371d990..af175e7 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -127,7 +127,7 @@ function real_prepare_install() { (
trap "spell_recover" SIGINT
save_libraries
save_binaries
- dispel --notriggers --nosustain $SPELL
+ dispel --notriggers --nosustain --noqueue $SPELL

fi
) &&
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index c0a1e8c..ec8d368 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -117,7 +117,7 @@ function run_conflicts() {
text="$text ${SPELL_COLOR}${spell_and_default[0]}${MESSAGE_COLOR}?"

if query "$text" ${spell_and_default[1]} ; then
- dispel ${spell_and_default[0]} || rc=1
+ dispel --noqueue ${spell_and_default[0]} || rc=1
echo ${spell_and_default[0]} >> $CONFLICT_LIST
else
echo $SPELL >> $FAILED_LIST
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index 87b62a0..efc9c11 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -338,6 +338,7 @@ function dispel_spell() {
remove_version_cache "$VERSION_STATUS" $SPELL &&
{ [[ $TRIGGER == off ]] || trigger "dispel";} &&
remove_triggers $SPELL &&
+ { [[ $DEQUEUE == off ]] || pop_install_queue $SPELL; } &&
message "${DISPEL_COLOR}Dispelled spell:" \
"${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" &&
activity_log "dispel" "$SPELL" "$VERSION" "success"
diff --git a/var/lib/sorcery/modules/libtriggers
b/var/lib/sorcery/modules/libtriggers
index c8e36eb..9bf3676 100755
--- a/var/lib/sorcery/modules/libtriggers
+++ b/var/lib/sorcery/modules/libtriggers
@@ -189,7 +189,7 @@ function do_trigger () {
cast -c "${TRIGGER[0]}"
;;
dispel_self)
- dispel "${TRIGGER[0]}"
+ dispel --noqueue "${TRIGGER[0]}"
;;
check_self)
cleanse --nofix_quick "${TRIGGER[0]}" ||



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (0fe056c0e9b07494a65c0d852d753074037c1d5b), Jaka Kranjc, 07/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page