[Commits] (morgen) Fix for bug 2539 - if sync failed to fetch a collection, you can't ask the collection for its displayName, silly

commits at osafoundation.org commits at osafoundation.org
Mon Feb 28 14:16:34 PST 2005


Commit by: morgen
Modified files:
chandler/parcels/osaf/framework/sharing/Sharing.py 1.80 1.81

Log message:
Fix for bug 2539 - if sync failed to fetch a collection, you can't ask the collection for its displayName, silly


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/sharing/Sharing.py.diff?r1=text&tr1=1.80&r2=text&tr2=1.81

Index: chandler/parcels/osaf/framework/sharing/Sharing.py
diff -u chandler/parcels/osaf/framework/sharing/Sharing.py:1.80 chandler/parcels/osaf/framework/sharing/Sharing.py:1.81
--- chandler/parcels/osaf/framework/sharing/Sharing.py:1.80	Mon Feb 21 08:44:26 2005
+++ chandler/parcels/osaf/framework/sharing/Sharing.py	Mon Feb 28 14:16:33 2005
@@ -1,5 +1,5 @@
-Allowed = "$Revision: 1.80 $"
-__date__ = "$Date: 2005/02/21 16:44:26 $"
+Allowed = "$Revision: 1.81 $"
+__date__ = "$Date: 2005/02/28 22:16:33 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -1636,9 +1636,12 @@
     try:
         share.sync()
     except SharingError, err:
-        msg = "Error syncing the '%s' collection\n" % share.contents.getItemDisplayName()
-        msg += "using the '%s' account:\n\n" % share.conduit.account.getItemDisplayName()
-        msg += err.message
+        try:
+            msg = "Error syncing the '%s' collection\n" % share.contents.getItemDisplayName()
+            msg += "using the '%s' account:\n\n" % share.conduit.account.getItemDisplayName()
+            msg += err.message
+        except:
+            msg = "Error during sync"
         application.dialogs.Util.ok(wx.GetApp().mainFrame,
                                     "Synchronization Error", msg)
 



More information about the Commits mailing list