diff options
author | Wade Berrier <wade@mono-cvs.ximian.com> | 2006-04-26 02:17:16 +0400 |
---|---|---|
committer | Wade Berrier <wade@mono-cvs.ximian.com> | 2006-04-26 02:17:16 +0400 |
commit | a7970e6a7806ff9b16cb7a6b0cba9e6b3edde46a (patch) | |
tree | f0976a3cc30de90ae1667db2b4d63ae71eec8836 /scripts | |
parent | d3efce4e2e91b41b57dee186981fba5b339cb4f6 (diff) |
* 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
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mono-find-provides.in | 4 | ||||
-rw-r--r-- | scripts/mono-find-requires.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in index ba46722ae67..ff649639f47 100644 --- 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 446d9fcfd2d..a721f23997f 100644 --- 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 |