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

scm at mail.sourcemage.org scm at mail.sourcemage.org
Tue May 2 01:40:02 EDT 2006


------------------------------------------------------------
revno: 17
committer: Andrew Stitt <afrayedknot at 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




More information about the SM-Commit mailing list