Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (6f07d4e0cacad4f2a0fa6d6f4767184fdd36cb49)

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 test-1.14 sorcery by Jaka Kranjc (6f07d4e0cacad4f2a0fa6d6f4767184fdd36cb49)
  • Date: Fri, 18 Jul 2008 09:58:40 -0500

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 9 +++++++++
etc/sorcery/version | 2 +-
var/lib/sorcery/modules/libapi | 2 +-
var/lib/sorcery/modules/libcast | 10 +++++-----
var/lib/sorcery/modules/libsorcery | 6 +++---
5 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 6f07d4e0cacad4f2a0fa6d6f4767184fdd36cb49
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

1.14.1-rc4

commit 188148d25463102a9b1a137869298d32c27e1a48
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libqueue: fixed pop_queue to not create the queue if it doesn't exist

this fixes sorcery popping up dispel --help when trying to install

(cherry-picked from commit 2a96459c10cc64c20686505cc310872fc3bdb404)

commit 4a35a6a1856e9f18e5c7db12d5131f3bbf3ab7c5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libapi: fixed a wrong function name in the starting comment

(cherry-picked from commit 0bb1e4d05cdb5e19e3327572e3ffebb74f72b380)

commit 74c175929040de1f23dd43914f50f8267b2f0744
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libcast: removed extraneus spaces in acquire_cast_lock messages

(cherry-picked from commit 9084c89a49ed459f73cd6c18ab9c027d04bba957)

diff --git a/ChangeLog b/ChangeLog
index 68a1493..740d6f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: fixed pop_queue to not create the queue if it doesn't
exist
+
+2008-07-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libapi: fixed a wrong function name in the starting comment
+
+2008-07-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcast: removed extraneus spaces in acquire_cast_lock messages
+
2008-07-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstage: install the rest of the files first, so any leading
directories
the configs need get properly created; renamed stage_install_rest to
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 7a978b6..f0a38fa 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1-rc3
+1.14.1-rc4
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index 626de78..d5a4465 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -70,7 +70,7 @@
# rm_source_dir (libgrimoire)
# sedit (libmisc)
# sub_depends (libdepends)
-# show_depends (libdepends)
+# show_up_depends (libdepends)
# spell_exiled (libstate)
# spell_held (libstate)
# spell_installed (libstate)
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index d9e6bfb..f17d884 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -598,21 +598,21 @@ function install_initd() {
function acquire_cast_lock() {
# locking - blocks normal spells if a solo cast is running,
# solo casts if any cast is running
- message "${MESSAGE_COLOR}Waiting for any${DEFAULT_COLOR} ${FILE_COLOR}" \
+ message "${MESSAGE_COLOR}Waiting for any${DEFAULT_COLOR}${FILE_COLOR}" \
"Solo${DEFAULT_COLOR} ${MESSAGE_COLOR}casts to complete..." \
"${DEFAULT_COLOR}"
lock_resources "solo" "cast"
if test -f $SOLO && grep -q "^$SPELL$" $SOLO ||
[ -f $SCRIPT_DIRECTORY/SOLO ]
then #SOLO spell
- message -n "${MESSAGE_COLOR}Waiting for${DEFAULT_COLOR} ${SPELL_COLOR}" \
+ message -n "${MESSAGE_COLOR}Waiting for${DEFAULT_COLOR}${SPELL_COLOR}" \
"all other${DEFAULT_COLOR} ${MESSAGE_COLOR}spells to" \
- " complete...${DEFAULT_COLOR}"
+ "complete...${DEFAULT_COLOR}"
excllock_resources "cast" "$SPELL"
else
message -n "${MESSAGE_COLOR}Waiting for any other casts of" \
- "${DEFAULT_COLOR} ${SPELL_COLOR}$SPELL${DEFAULT_COLOR}" \
- " ${MESSAGE_COLOR}to complete...${DEFAULT_COLOR}"
+ "${DEFAULT_COLOR}${SPELL_COLOR}$SPELL${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}to complete...${DEFAULT_COLOR}"
lock_resources "cast" "$SPELL"
unlock_resources "solo" "cast"
fi
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index ba6e114..70440b5 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -659,10 +659,10 @@ function pop_queue() { (
local ITEM=`esc_str $2`
local exit_code=0

+ [[ -f $1 ]] || return 1
+
lock_start_transaction "$1" tQUEUE_FILE
- if ! [ -f "$1" ]; then
- exit_code=1
- elif [ -n "$ITEM" ]; then
+ if [ -n "$ITEM" ]; then
grep -v "^$ITEM\$" $1 > $tQUEUE_FILE
else
FOUND=`sed -n 1p $1`



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (6f07d4e0cacad4f2a0fa6d6f4767184fdd36cb49), Jaka Kranjc, 07/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page