/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-30 16:47:00 UTC
  • Revision ID: teddy@recompile.se-20150530164700-77zrd7964gdhbk1f
mandos: Disable D-Bus if any DBusException is raised when connecting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
2575
2575
            old_bus_name = dbus.service.BusName(
2576
2576
                "se.bsnet.fukt.Mandos", bus,
2577
2577
                do_not_queue=True)
2578
 
        except dbus.exceptions.NameExistsException as e:
 
2578
        except dbus.exceptions.DBusException as e:
2579
2579
            logger.error("Disabling D-Bus:", exc_info=e)
2580
2580
            use_dbus = False
2581
2581
            server_settings["use_dbus"] = False