diff options
| author | Wade Berrier <wade@mono-cvs.ximian.com> | 2006-07-19 22:06:41 +0400 |
|---|---|---|
| committer | Wade Berrier <wade@mono-cvs.ximian.com> | 2006-07-19 22:06:41 +0400 |
| commit | 812f508c35b2a7247b93e59447afca83452ebc38 (patch) | |
| tree | 04c09f878d68ab88de1653ee0e19e50f9f8c2cf5 | |
| parent | 562f96a255babf7dfa2a99724c1e0b3174736b88 (diff) | |
* scripts/mono-find-provides.in: Remove support for only scanning files in the gac.mono-1-1-16
The problem is that mono apps are often broken up into subpackages, and deps can only
be resolved if the assemblies are in the gac, even when they sometimes shouldn't be.
(See https://bugzilla.novell.com/show_bug.cgi?id=144655)
(merged 62759 from trunk)
svn path=/branches/mono-1-1-16/mono/; revision=62761
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | scripts/mono-find-provides.in | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 94a77638408..47780de8713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-19 Wade Berrier <wberrier@novell.com> + + * scripts/mono-find-provides.in: Remove support for only scanning files in the gac. + The problem is that mono apps are often broken up into subpackages, and deps can only + be resolved if the assemblies are in the gac, even when they sometimes shouldn't be. + (See https://bugzilla.novell.com/show_bug.cgi?id=144655) + 2006-07-04 Zoltan Varga <vargaz@gmail.com> * configure.in: Add the contents of LIBS to libmono_ldflags on sol-x86 too. diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in index ff649639f47..f7ee80ea4cb 100644 --- a/scripts/mono-find-provides.in +++ b/scripts/mono-find-provides.in @@ -14,7 +14,8 @@ 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/")) +#monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/")) +# Disabled... see ChangeLog a=`which "$0"` d=`dirname "$a"` |