Skip to content
Browse files

* 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=/branches/mono-1-1-13/mono/; revision=59882
  • Loading branch information...
1 parent ffa2b97 commit 32fa15d9b0e7e033d155d01ef742c4e12bd5a9ed Wade Berrier committed Apr 25, 2006
Showing with 11 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +4 −0 scripts/mono-find-provides.in
  3. +1 −1 scripts/mono-find-requires.in
View
6 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-03-13 Chris Toshok <toshok@ximian.com>
* data/net_2_0/machine.config: revert r55809, as this change
View
4 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"`
View
2 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

0 comments on commit 32fa15d

Please sign in to comment.
Something went wrong with that request. Please try again.