Public SourceMage Discussion List

["Robert Helgesson" <rycee AT home.se>]

On Thu, Apr 08, 2004 at 11:10:37 +0200, Arwed von Merkatz wrote:
> I noticed one sorcery problem after switching: changing the provider for
> a service like X11-LIBS doesn't work too well, all spells still wanted
> to install xfree86 when run with a cast -c.
> I fixed it for me with a
> $ sed -i 's/:xfree86:xorg:/'  /var/state/sorcery/depends
> But there should definitely be a way in sorcery to do this, either with
> a seperate command or automatically when sorcery detects you installed a
> new provider (don't know how hard that would be).

The attached patch should fix this problem.

-- 
/     Robert Helgesson     |--    rycee AT home.se     --\
\-- GPG Key ID: 41E95A5B --|   http://www.rycee.cx/   /
diff -Nurp modules.orig/libdepends modules/libdepends
--- modules.orig/libdepends     2004-04-08 12:28:27.000000000 +0200
+++ modules/libdepends  2004-04-08 12:40:53.000000000 +0200
@@ -380,7 +380,10 @@ function work_depends_provider()
 
   local provider=${status[1]%(*}    # Name of spell which provides $1
 
-  if [[ $RECONFIGURE || ! $provider ]] ; then
+  if [[ $RECONFIGURE || ! $provider  \
+        || ! $( installed_version $provider ) ]] ; then
+    # Make sure any previous entry is removed
+    remove_depends_status $SPELL ${status[1]}
     select_provider "provider" "$1"
   fi
 
@@ -427,7 +430,11 @@ function work_optional_depends_provider(
 
   local provider=${status[1]%(*}    # Name of spell which provides $1
 
-  if [[ $RECONFIGURE || ! ${status[2]} ]] ; then
+  if [[ $RECONFIGURE || ! ${status[2]}  \
+        || ! $( installed_version $provider ) ]] ; then
+
+    # Make sure any previous entry is removed
+    remove_depends_status $SPELL ${status[1]}
 
     select_provider "provider" "$1" "$4" "optional"