Merge lp:~dobey/ubuntuone-client/fix-711324 into lp:ubuntuone-client

[dobey]

Trap DBusException to avoid errors when dbus session bus is not available.

[Diego Sarmentero (diegosarmentero)]

looks good
+1

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'bin/ubuntuone-login'
--- bin/ubuntuone-login	2012-10-15 20:12:29 +0000
+++ bin/ubuntuone-login	2012-10-19 20:09:20 +0000
@@ -1,8 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Author: Natalia B. Bidart <[e-mail]>
-#
 # Copyright 2010-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -32,7 +30,6 @@
 """The script tu ron the Ubuntu One Login D-Bus service."""
 
 # Invalid name "ubuntuone-login"
-# pylint: disable=C0103
 
 import logging
 import os
@@ -54,25 +51,30 @@
 
 if __name__ == "__main__":
     # Register DBus service for making sure we run only one instance
-    bus = dbus.SessionBus()
-    name = bus.request_name(DBUS_BUS_NAME,
-                            dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
-    if name == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
-        logger.error("Ubuntu One login manager already running, quitting.")
-        sys.exit(0)
-
-    if os.environ.get('U1_DEBUG'):
-        debug_handler = logging.StreamHandler(sys.stderr)
-        debug_handler.setFormatter(basic_formatter)
-        debug_handler.setLevel(logging.DEBUG)
-        logger.setLevel(logging.DEBUG)
-        logger.addHandler(debug_handler)
-
-    logger.info("Starting Ubuntu One login manager for bus %r.", DBUS_BUS_NAME)
-    bus_name = dbus.service.BusName(DBUS_BUS_NAME, bus=dbus.SessionBus())
-    mainloop = GLib.MainLoop()
-    CredentialsManagement(timeout_func=GLib.timeout_add,
-                          shutdown_func=mainloop.quit,
-                          bus_name=bus_name, object_path=DBUS_CREDENTIALS_PATH)
-
-    mainloop.run()
+    try:
+        bus = dbus.SessionBus()
+        name = bus.request_name(DBUS_BUS_NAME,
+                                dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
+        if name == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
+            logger.error("Ubuntu One login manager already running, quitting.")
+            sys.exit(0)
+    except dbus.DBusException:
+        pass
+    else:
+        if os.environ.get('U1_DEBUG'):
+            debug_handler = logging.StreamHandler(sys.stderr)
+            debug_handler.setFormatter(basic_formatter)
+            debug_handler.setLevel(logging.DEBUG)
+            logger.setLevel(logging.DEBUG)
+            logger.addHandler(debug_handler)
+
+        logger.info("Starting Ubuntu One login manager for bus %r.",
+                    DBUS_BUS_NAME)
+        bus_name = dbus.service.BusName(DBUS_BUS_NAME, bus=bus)
+        mainloop = GLib.MainLoop()
+        CredentialsManagement(timeout_func=GLib.timeout_add,
+                              shutdown_func=mainloop.quit,
+                              bus_name=bus_name,
+                              object_path=DBUS_CREDENTIALS_PATH)
+
+        mainloop.run()