Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.13 sorcery by Andrew Stitt (873436514cd6d95d0f8e49d8a0c2ff17d0eba118)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andrew Stitt <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.13 sorcery by Andrew Stitt (873436514cd6d95d0f8e49d8a0c2ff17d0eba118)
  • Date: Sat, 29 Jul 2006 12:54:37 -0500

GIT changes to test-1.13 sorcery by Andrew Stitt <astitt AT sourcemage.org>:

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

New commits:
commit 873436514cd6d95d0f8e49d8a0c2ff17d0eba118
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 12904
(cherry picked from ffa3356d87fd8279ac98981c6876018eabda4d51 commit)

diff --git a/ChangeLog b/ChangeLog
index 01ea775..b771349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-29 Andrew Stitt <astitt AT sourcemage.org>
+ * libstate: fix bug 12904, get_depends_options is broken with
+ spellnames containing regexp characters. Patch from Jaka Kranjc
+
2006-06-23 Andrew Stitt <astitt AT sourcemage.org>
* libtrack: add code so sorcery works with installwatch 7

diff --git a/var/lib/sorcery/modules/libstate
b/var/lib/sorcery/modules/libstate
index 2f40b1e..be868c8 100755
--- a/var/lib/sorcery/modules/libstate
+++ b/var/lib/sorcery/modules/libstate
@@ -141,14 +141,12 @@ ## @param dependency spell
## @Stdout list of options
##
## Returns a list of options for ./configure from $1
-## If the second argument is given, returns options for the
-## matching pair of spell:dependency
## Primarily aimed at generating $OPTS contents
##
## Prints out one line of output
#---------------------------------------------------------------------
function get_depends_options()
-{ # $1=depends_status $2=spell [$3]=dependency spell
+{ # $1=depends_status $2=spell

local depends_status=$1
shift
@@ -158,10 +156,9 @@ function get_depends_options()
return
}

- local START="$(esc_str $1):"
- [ -n "$2" ] && START="${START}$(esc_str $2):"
+ local START="$(esc_str $1)"
debug "libstate" "get_depends_options() - START=$START"
- awk -F ':' "/^$START/ { if (\$3 == \"on\") OPTS = OPTS \" \" \$5; else
OPTS = OPTS \" \" \$6; } END { print OPTS; }" $depends_status
+ awk -F ':' -v start=$START "{ if (\$1 == start) if (\$3 == \"on\") OPTS =
OPTS \" \" \$5; else OPTS = OPTS \" \" \$6; } END { print OPTS; }"
$depends_status 2> /dev/null
}





  • [SM-Commit] GIT changes to test-1.13 sorcery by Andrew Stitt (873436514cd6d95d0f8e49d8a0c2ff17d0eba118), Andrew Stitt, 07/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page