Mailinglist Archive: opensuse-commit (1028 mails)

< Previous Next >
commit beagle
  • From: root@xxxxxxx (h_root)
  • Date: Fri, 23 Jun 2006 17:07:08 +0200 (CEST)
  • Message-id: <20060623150708.349A16C484@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package beagle
checked in at Fri Jun 23 17:07:08 CEST 2006.

--------
--- GNOME/beagle/beagle.changes 2006-06-22 22:08:42.000000000 +0200
+++ beagle/beagle.changes 2006-06-23 16:59:07.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 23 16:58:30 CEST 2006 - joeshaw@xxxxxxx
+
+- Add a patch to catch exceptions when calling the GetChanges()
+ methods on calendars and addressbooks. bnc #187792.
+
+-------------------------------------------------------------------

New:
----
beagle-eds-handle-exception.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ beagle.spec ++++++
--- /var/tmp/diff_new_pack.zdEi4B/_old 2006-06-23 17:06:56.000000000 +0200
+++ /var/tmp/diff_new_pack.zdEi4B/_new 2006-06-23 17:06:56.000000000 +0200
@@ -18,7 +18,7 @@
Group: Productivity/Other
Autoreqprov: on
Version: 0.2.3
-Release: 62
+Release: 63
Summary: Desktop Search Application
URL: http://www.gnome.org/projects/beagle/
Source: %{name}-%{version}.tar.gz
@@ -58,6 +58,7 @@
Patch31: beagle-calendar-null-description-fix.patch
Patch32: beagle-index-helper-zombie.patch
Patch33: beagle-mono-workaround-dangling-log-symlinks.patch
+Patch34: beagle-eds-handle-exception.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prereq: /usr/sbin/groupadd /usr/sbin/useradd
Requires: mono-core >= 1.1.13.5
@@ -332,6 +333,7 @@
%patch31
%patch32
%patch33
+%patch34

%build
rm po/no.*
@@ -489,6 +491,9 @@
%{prefix}/%_lib/pkgconfig/*.pc

%changelog -n beagle
+* Fri Jun 23 2006 - joeshaw@xxxxxxx
+- Add a patch to catch exceptions when calling the GetChanges()
+ methods on calendars and addressbooks. bnc #187792.
* Thu Jun 22 2006 - gekker@xxxxxxx
- Update translations for zh_CN (#179555)
* Mon Jun 19 2006 - joeshaw@xxxxxxx



++++++ beagle-eds-handle-exception.patch ++++++
Index: beagled/EvolutionDataServerQueryable/BookContainer.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/EvolutionDataServerQueryable/BookContainer.cs,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- beagled/EvolutionDataServerQueryable/BookContainer.cs 4 Nov 2005 18:01:37 -0000 1.3
+++ beagled/EvolutionDataServerQueryable/BookContainer.cs 5 May 2006 14:37:38 -0000 1.5
@@ -93,7 +93,14 @@ namespace Beagle.Daemon.EvolutionDataSer
string[] removed;

Logger.Log.Debug ("Getting addressbook changes for {0}", this.source.Uri);
- this.book.GetChanges ("beagle-" + this.fingerprint, out added, out changed, out removed);
+
+ try {
+ this.book.GetChanges ("beagle-" + this.fingerprint, out added, out changed, out removed);
+ } catch (Exception e) {
+ Logger.Log.Warn ("Unable to get changes for {0}: {1}", this.source.Uri, e.Message);
+ return;
+ }
+
Logger.Log.Debug ("Addressbook {0}: {1} added, {2} changed, {3} removed",
this.book.Uri, added.Length, changed.Length, removed.Length);

Index: beagled/EvolutionDataServerQueryable/CalContainer.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/EvolutionDataServerQueryable/CalContainer.cs,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- beagled/EvolutionDataServerQueryable/CalContainer.cs 31 Jan 2006 22:55:33 -0000 1.4
+++ beagled/EvolutionDataServerQueryable/CalContainer.cs 5 May 2006 14:37:38 -0000 1.6
@@ -88,7 +88,14 @@ namespace Beagle.Daemon.EvolutionDataSer
string[] removed;

Logger.Log.Debug ("Getting calendar changes for {0}", this.source.Uri);
- this.cal.GetChanges ("beagle-" + this.fingerprint, out added, out changed, out removed);
+
+ try {
+ this.cal.GetChanges ("beagle-" + this.fingerprint, out added, out changed, out removed);
+ } catch (Exception e) {
+ Logger.Log.Warn ("Unable to get changes for {0}: {1}", this.source.Uri, e.Message);
+ return;
+ }
+
Logger.Log.Debug ("Calendar {0}: {1} added, {2} changed, {3} removed",
this.cal.Uri, added.Length, changed.Length, removed.Length);

Index: beagled/EvolutionDataServerQueryable/SourcesHandler.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/EvolutionDataServerQueryable/SourcesHandler.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- beagled/EvolutionDataServerQueryable/SourcesHandler.cs 27 Feb 2006 21:36:29 -0000 1.2
+++ beagled/EvolutionDataServerQueryable/SourcesHandler.cs 18 Apr 2006 15:07:33 -0000 1.3
@@ -115,7 +115,7 @@ namespace Beagle.Daemon.EvolutionDataSer

private void OnSourceAdded (object o, SourceAddedArgs args)
{
- Container cont = (Container) Activator.CreateInstance (this.container_type, new object[] { args.Source, this.fingerprint });
+ Container cont = (Container) Activator.CreateInstance (this.container_type, new object[] { args.Source, this.queryable, this.fingerprint });
if (!cont.OpenClient ())
return;
cont.IndexAll ();


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx

< Previous Next >