rpms/mono-addins/F-10 mono-addins-0.3.1-exception-fix.patch, NONE, 1.1 mono-addins.spec, 1.10, 1.11

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/mono-addins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343

Modified Files:
	mono-addins.spec 
Added Files:
	mono-addins-0.3.1-exception-fix.patch 
Log Message:
* Mon Aug 24 2009 Christian Krause <chkr at fedoraproject.org> - 0.3.1-3.3
- add upstream bug fix to prevent exception when no local addins can
be found (BZ #514936)


mono-addins-0.3.1-exception-fix.patch:
 ExtensionNode.cs |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE mono-addins-0.3.1-exception-fix.patch ---
diff -uNr mono-addins-0.3.1.old/Mono.Addins/Mono.Addins/ExtensionNode.cs mono-addins-0.3.1/Mono.Addins/Mono.Addins/ExtensionNode.cs
--- mono-addins-0.3.1.old/Mono.Addins/Mono.Addins/ExtensionNode.cs	2008-01-30 23:37:52.000000000 +0100
+++ mono-addins-0.3.1/Mono.Addins/Mono.Addins/ExtensionNode.cs	2009-07-31 17:17:12.000000000 +0200
@@ -123,7 +123,6 @@
 				if (childrenLoaded)
 					return childNodes;
 				
-				childrenLoaded = true;
 				
 				try {
 					if (treeNode.Children.Count == 0) {
@@ -135,6 +134,8 @@
 					AddinManager.ReportError (null, null, ex, false);
 					childNodes = ExtensionNodeList.Empty;
 					return childNodes;
+				} finally {
+					childrenLoaded = true;
 				}
 
 				ArrayList list = new ArrayList ();


Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/F-10/mono-addins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mono-addins.spec	2 Mar 2009 13:46:45 -0000	1.10
+++ mono-addins.spec	24 Aug 2009 20:03:40 -0000	1.11
@@ -2,12 +2,15 @@
 
 Name:		mono-addins
 Version:	0.3.1
-Release:	3%{?dist}.2
+Release:	3%{?dist}.3
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	GPLv2
 Patch0:		mono-addins.patch
 Patch1:		mono-addins-fix_addin_scan.patch
+# use upstream bug fix to prevent exception:
+# http://anonsvn.mono-project.com/viewvc?view=revision&revision=112158
+Patch2:		mono-addins-0.3.1-exception-fix.patch
 URL:		http://www.mono-project.com/
 Source0:	%{name}-%{version}.tar.bz2	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,6 +36,7 @@ and for creating libraries which extend 
 %setup -q
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .fix_addin_scan
+%patch2 -p1 -b .exception-fix
 autoreconf -f -i -s
 
 %build
@@ -63,6 +67,10 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Aug 24 2009 Christian Krause <chkr at fedoraproject.org> - 0.3.1-3.3
+- add upstream bug fix to prevent exception when no local addins can
+be found (BZ #514936)
+
 * Mon Mar 02 2009 David Nielsen <dnielsen at fedoraproject.org> - 0.3.1-3.2
 - spec change suggested by ivazquez