Author: lluis Date: 2008-02-20 11:06:59 -0500 (Wed, 20 Feb 2008) New Revision: 96264
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs Log: * MonoDevelop.Core/SystemAssemblyService.cs: Don't install packages provided by add-ins that already exist in the system. Modified: trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog =================================================================== --- trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog 2008-02-20 16:04:54 UTC (rev 96263) +++ trunk/monodevelop/main/src/core/MonoDevelop.Core/ChangeLog 2008-02-20 16:06:59 UTC (rev 96264) @@ -1,3 +1,8 @@ +2008-02-20 Lluis Sanchez Gual <[EMAIL PROTECTED]> + + * MonoDevelop.Core/SystemAssemblyService.cs: Don't install packages provided + by add-ins that already exist in the system. + 2008-02-18 Lluis Sanchez Gual <[EMAIL PROTECTED]> * MonoDevelop.Core.ProgressMonitoring/ConsoleProgressStatus.cs: Allow Modified: trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs =================================================================== --- trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs 2008-02-20 16:04:54 UTC (rev 96263) +++ trunk/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/SystemAssemblyService.cs 2008-02-20 16:06:59 UTC (rev 96264) @@ -395,10 +395,15 @@ void OnPackagesChanged (object s, ExtensionNodeEventArgs args) { PackageExtensionNode node = (PackageExtensionNode) args.ExtensionNode; - if (args.Change == ExtensionChange.Add) - RegisterPackage (node.Name, node.Version, node.Name, node.TargetClrVersion, node.GacRoot, node.Assemblies); - else - UnregisterPackage (node.Name, node.Version); + if (args.Change == ExtensionChange.Add) { + if (GetPackage (node.Name, node.Version) == null) + RegisterPackage (node.Name, node.Version, node.Name, node.TargetClrVersion, node.GacRoot, node.Assemblies); + } + else { + SystemPackage p = GetPackage (node.Name, node.Version); + if (p.IsInternalPackage) + UnregisterPackage (node.Name, node.Version); + } } void RegisterSystemAssemblies (string prefix, string version, ClrVersion ver) _______________________________________________ Mono-patches maillist - Mono-patches@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-patches