Skip to Content.
Sympa Menu

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

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 (597434539faae1da86cf646165637e6e276d9f95)
  • Date: Fri, 19 Sep 2008 13:49:03 -0500

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

ChangeLog | 3 +++
var/lib/sorcery/modules/libdepends | 8 ++++----
var/lib/sorcery/modules/libmisc | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 597434539faae1da86cf646165637e6e276d9f95
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libdepends, libmisc: fixed bad real_list_find invocations #14743

diff --git a/ChangeLog b/ChangeLog
index b79a19b..63ccaa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-09-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends, libmisc: fixed bad real_list_find invocations #14743
+
2008-09-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libsorcery: remove the (empty) safe dir at the end of filter()

diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index f6fa34f..bb212f4 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -986,7 +986,7 @@ function work_depends_provider()
# check if we've already answered this question
if [[ ! $default ]]; then
for tmp in $CANDIDATES; do
- real_list_find "${spells[@]}" "$tmp" && default=$tmp && break
+ real_list_find "${spells[*]}" "$tmp" && default=$tmp && break
done
fi

@@ -1131,7 +1131,7 @@ function work_optional_depends_provider()
# check if we've already answered this question
if [[ ! $default ]]; then
for tmp in $CANDIDATES; do
- real_list_find "${spells[@]}" "$tmp" && default=$tmp && break
+ real_list_find "${spells[*]}" "$tmp" && default=$tmp && break
done
fi

@@ -1252,7 +1252,7 @@ function work_optional_depends_spell()
# check the install queue
if [[ ! $default ]]; then
debug "libdepends" "Checking in queue"
- real_list_find "${spells[@]}" "$1" && default=on
+ real_list_find "${spells[*]}" "$1" && default=on
fi

# check if installed/held
@@ -1371,7 +1371,7 @@ function private_up_trigger() {

# afk 6-7-06 Im not sure this line is correct, it seems to only
# make a circular depends, instead we want $TARGET to depend on $SPELL
- real_list_find "${NEW_DEPENDS[@]}" "$TARGET" ||
+ real_list_find "${NEW_DEPENDS[*]}" "$TARGET" ||
NEW_DEPENDS=( ${NEW_DEPENDS[*]} $spell)

triggerees=( ${triggerees[*]} $TARGET )
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 5603d6b..a7c55b0 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -666,7 +666,7 @@ function real_list_add () {
## exact, regular expressions and globbing patterns are not supported.
##
## Warning, this function takes a real string, not a variable name as
-## other list_* functions.
+## other list_* functions. Use the ${var[*]} form when passing arrays
##
#---------------------------------------------------------------------
function real_list_find () {



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (597434539faae1da86cf646165637e6e276d9f95), Jaka Kranjc, 09/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page