diff options
| author | Lluis Sanchez <lluis@novell.com> | 2009-10-29 19:15:42 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2009-10-29 19:15:42 +0300 |
| commit | 472847207d83b5a8ec0db31e4340b7462ab3b501 (patch) | |
| tree | c181d864cca378c78c9d0bf7ca83bbf5b735e071 /main/src/addins/MonoDevelop.Autotools | |
| parent | 7ef9118688d002f4f5eca450c35f2cc451b6ed42 (diff) | |
* MakefileOptionPanelWidget.cs: Improve error handling.
svn path=/trunk/monodevelop/; revision=145046
Diffstat (limited to 'main/src/addins/MonoDevelop.Autotools')
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/ChangeLog | 4 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/main/src/addins/MonoDevelop.Autotools/ChangeLog b/main/src/addins/MonoDevelop.Autotools/ChangeLog index 5ca043e4f8..12c01c74f0 100644 --- a/main/src/addins/MonoDevelop.Autotools/ChangeLog +++ b/main/src/addins/MonoDevelop.Autotools/ChangeLog @@ -1,5 +1,9 @@ 2009-10-29 Lluis Sanchez Gual <lluis@novell.com> + * MakefileOptionPanelWidget.cs: Improve error handling. + +2009-10-29 Lluis Sanchez Gual <lluis@novell.com> + * gtk-gui/gui.stetic: * gtk-gui/generated.cs: * gtk-gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs: diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs index e6dc0a78ae..581a57b08f 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs @@ -958,12 +958,17 @@ namespace MonoDevelop.Autotools // 'core' here simply means any assemblies in the gac foreach (string file in list) { - string fullName = dnp.AssemblyContext.GetAssemblyFullName (file, dnp.TargetFramework); - if (fullName != null) { - SystemAssembly asm = dnp.AssemblyContext.GetAssemblyFromFullName (fullName, null, dnp.TargetFramework); - if (asm != null && asm.Package.IsGacPackage) - return true; + try { + string fullName = dnp.AssemblyContext.GetAssemblyFullName (file, dnp.TargetFramework); + if (fullName != null) { + SystemAssembly asm = dnp.AssemblyContext.GetAssemblyFromFullName (fullName, null, dnp.TargetFramework); + if (asm != null && asm.Package.IsGacPackage) + return true; + } + } catch { + // Ignore } + if (IsPkgRef (file)) return true; |