sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] BZR Change 17 to test sorcery by Andrew Stitt <afrayedknot@thefrayedknot>

From: scm AT mail.sourcemage.org
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] BZR Change 17 to test sorcery by Andrew Stitt <afrayedknot@thefrayedknot>
Date: Tue, 2 May 2006 00:40:02 -0500

------------------------------------------------------------
revno: 17
committer: Andrew Stitt <afrayedknot@thefrayedknot>
branch nick: test
timestamp: Mon 2006-05-01 22:39:16 -0700
message:
merge fix for default provider searching

=== modified file 'ChangeLog'
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,6 @@
+2006-05-01 Andrew Stitt <astitt AT sourcemage.org>
+ * libdepends: fix search for default provider
+
2006-04-21 Andrew Stitt <astitt AT sourcemage.org>
* libsummon: fix bug 11372, bad spells can make us unlock the wrong
resource, causing subsequent summons to hang. Also fix return code

=== modified file 'var/lib/sorcery/modules/libdepends'
--- var/lib/sorcery/modules/libdepends
+++ var/lib/sorcery/modules/libdepends
@@ -683,7 +683,7 @@

# check if theres a default provider
if [[ ! $default ]]; then
- explode "$(search_default_provider $DEFAULT_PROVIDERS "" "$1")" ":"
"status"
+ explode "$(search_default_provider $DEFAULT_PROVIDERS ".*" "$1")" ":"
"status"
tmp=${status[0]}
[[ $tmp ]] && echo $CANDIDATES|grep -q "\<$tmp\>" && default=$tmp
fi
@@ -776,7 +776,7 @@

# check if theres a default provider
if [[ ! $default ]]; then
- tmp=$(search_default_provider $DEFAULT_PROVIDERS "" "$1")
+ tmp=$(search_default_provider $DEFAULT_PROVIDERS ".*" "$1")

# make sure we found /something/ before trying to analyze it
# otherwise we'll fall into the else case and use 'none' as the

[SM-Commit] BZR Change 17 to test sorcery by Andrew Stitt <afrayedknot@thefrayedknot>, scm, 05/02/2006