Merge lp:~rodrigo-moya/ubuntuone-client/fix-657850 into lp:ubuntuone-client

[Rodrigo Moya]

Catch exceptions from desktopcouch code

[dobey (dobey)]

We should avoid simply trapping all exceptions here, and this should probably have a test case, so that we can validate that it doesn't regress.

It should only trap an exception for the first two calls which you put inside the try:, and set exclusions = [] inside the except: I think.

review: Needs Fixing

Unmerged revisions

735. By Rodrigo Moya on 2010-10-13

Catch exceptions from desktopcouch code

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-09-21 21:29:07 +0000
+++ bin/ubuntuone-preferences	2010-10-13 09:54:44 +0000
@@ -705,15 +705,18 @@
         if dcouch:
             Thread(target=self.__check_for_bindwood).start()
 
-            self.dcouch = dcouch.ReplicationExclusion()
-            exclusions = self.dcouch.all_exclusions()
-            for check in [self.bookmarks_check,
-                          self.abook_check,
-                          self.gwib_check]:
-                if check.get_data('dbname') in exclusions:
-                    check.set_active(False)
-                else:
-                    check.set_active(True)
+            try:
+                self.dcouch = dcouch.ReplicationExclusion()
+                exclusions = self.dcouch.all_exclusions()
+                for check in [self.bookmarks_check,
+                              self.abook_check,
+                              self.gwib_check]:
+                    if check.get_data('dbname') in exclusions:
+                        check.set_active(False)
+                    else:
+                        check.set_active(True)
+            except Exception, e:
+                logger.error(e)
         else:
             self.bookmarks_check.set_sensitive(False)
             self.abook_check.set_sensitive(False)