Skip to Content.
Sympa Menu

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

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 (7f791b1a0217277036766ed1c12cafc4934467e7)
  • Date: Sun, 27 Jan 2008 07:15:07 -0600

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libstate | 18 +++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 7f791b1a0217277036766ed1c12cafc4934467e7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libstate: fixed query_spell_status to be regression free
(was breaking on "spells" with slashes in their names - in gaze)
(cherry picked from commit 2545e6e9e4e5f43c6281b51354e8e9ab3d01adc1)

diff --git a/ChangeLog b/ChangeLog
index 2d0d9fd..215fdfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libstate: fixed query_spell_status to be regression free
+ (was breaking on "spells" with slashes in their names - in gaze)
+
2008-01-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* cast: fixed typo in pre-review-queue message #14228

diff --git a/var/lib/sorcery/modules/libstate
b/var/lib/sorcery/modules/libstate
index b4c87b8..d102adf 100755
--- a/var/lib/sorcery/modules/libstate
+++ b/var/lib/sorcery/modules/libstate
@@ -618,22 +618,22 @@ function search_spell_status() {
function query_spell_status()
{ #$1=spell, $2=(OPT)version

- local version return_var __status rc
+ local return_var __status
+ [[ -e $SPELL_STATUS ]] || return 1
+
+ lock_file "$SPELL_STATUS"
if [[ -z $3 ]]; then
- version=".*"
+ [[ -z $2 ]] && return 0
return_var="$2"
+ __status=$(awk -F: -v spell="$1" '{ if (spell == $1) status=$3 }
END{print status}' "$SPELL_STATUS")
else
- version=`esc_str ${2:-".*"}`
return_var="$3"
+ __status=$(awk -F: -v spell="$1" -v version="$2" '{ if (spell == $1 &&
version == $4) status=$3 } END{print status}' "$SPELL_STATUS")
fi
-
- lock_file "$SPELL_STATUS"
- __status=$(sed -n "/^$1:.*:\(.*\):$version$/ { s,,\1,; h }; $ {x; p}"
"$SPELL_STATUS")
- rc=$?
unlock_file "$SPELL_STATUS"
- eval "$return_var=\"\$__status\""

- return $rc
+ eval "$return_var=\"\$__status\""
+ return 0
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7f791b1a0217277036766ed1c12cafc4934467e7), Jaka Kranjc, 01/27/2008

Archive powered by MHonArc 2.6.24.

Top of Page