Merge lp:~dobey/ubuntuone-client/fix-657850-stable into lp:ubuntuone-client/stable-1-4

[dobey]

Handle the case when replication is not available but desktopcouch is installed

[Roman Yepishev (rye)]

Works great, the services checkboxes are disabled and info is shown properly even if paired_server record is missing in management db.

review: Approve (fieldtest)

[Natalia Bidart (nataliabidart)]

review: Approve

[lp:~dobey/ubuntuone-client/fix-657850-stable]

744. By dobey on 2011-01-05

Fix the lint issue and log the ValueError

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-09-21 21:29:07 +0000
+++ bin/ubuntuone-preferences	2011-01-06 15:52:05 +0000
@@ -702,9 +702,14 @@
     def connect_desktopcouch_exclusion(self):
         """Hook up to desktopcouch enablement API, or disable the UI."""
         # Hook up to desktopcouch, or die trying
-        if dcouch:
+        try:
+            if not dcouch:
+                raise ValueError('Replication service not available.')
+
+            # Check bindwood availability
             Thread(target=self.__check_for_bindwood).start()
 
+            # Get the exclusion settings
             self.dcouch = dcouch.ReplicationExclusion()
             exclusions = self.dcouch.all_exclusions()
             for check in [self.bookmarks_check,
@@ -714,10 +719,13 @@
                     check.set_active(False)
                 else:
                     check.set_active(True)
-        else:
-            self.bookmarks_check.set_sensitive(False)
-            self.abook_check.set_sensitive(False)
-            self.gwib_check.set_sensitive(False)
+        except ValueError, e:
+            # Replication is not avaialble, so disable the UI
+            for check in [self.bookmarks_check,
+                          self.abook_check,
+                          self.gwib_check]:
+                check.set_sensitive(False)
+            logger.error(e)
 
     def toggle_db_sync(self, dbname, disable=False):
         """