* scripts/mono-find-provides.in: Only scan files that are in the gac.

This allows packages to contain private assemblies that won't conflict
with other packages. Fixes bugzilla.novell.com #144655.

svn path=/trunk/mono/; revision=59881

diff --git a/ChangeLog b/ChangeLog
index 34ebf62e3637bf4d02d59950e02280ce79af42ab..d5612f23490064e4df1c0730f70e3ed39aaf466b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-25  Wade Berrier <wberrier@novell.com>
+
+       * scripts/mono-find-provides.in: Only scan files that are in the gac.
+       This allows packages to contain private assemblies that won't conflict 
+       with other packages. Fixes bugzilla.novell.com #144655.
+
 2006-04-21  Alp Toker  <alp@atoker.com>
 
        * scripts/mono-service.in: Usage info fixes:

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index ba46722ae679b29999d1bacbb74ce52aea687522..ff649639f470058ee2bcea531f410a34865751c4 100644 (file)
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -12,6 +12,10 @@ IFS=$'\n'
 filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
 
+# Only include files with /gac/ in path
+#  (Allows packages to contain private assemblies that don't conflict with other packages)
+monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
+
 a=`which "$0"`
 d=`dirname "$a"`
 

diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index 446d9fcfd2da452347b4bf3c8a7340dff66bb6e9..a721f23997f1a8e3258df5ea067da8ad8e5fc64d 100644 (file)
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -80,7 +80,7 @@ UNIQ=$(echo "$PROVIDES
 $REQUIRES" | sort | uniq -u)
 
 #
-# Of those, only chose the ones that are in REQUIRES
+# Of those, only choose the ones that are in REQUIRES
 #
 echo "$UNIQ
 $REQUIRES" | sort | uniq -d