From edb31e2d74936ed1972003a19115c47e9fa4c96b Mon Sep 17 00:00:00 2001 From: souliane Date: Sun, 17 Apr 2016 13:37:40 +0200 Subject: [PATCH] plugin adhoc_dbus, jp (cmd/adhoc): fixes adHocDBusAddAuto when no bus is found fix bug 134 --- frontends/src/jp/cmd_adhoc.py | 3 +++ src/plugins/plugin_adhoc_dbus.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontends/src/jp/cmd_adhoc.py b/frontends/src/jp/cmd_adhoc.py index 15b92001..e068445e 100644 --- a/frontends/src/jp/cmd_adhoc.py +++ b/frontends/src/jp/cmd_adhoc.py @@ -48,6 +48,9 @@ class Remote(base.CommandBase): bus_name, methods = self.host.bridge.adHocDBusAddAuto(name, jids, self.args.groups, magics, self.args.forbidden_jids, self.args.forbidden_groups, flags, self.profile) + if not bus_name: + self.disp(_("No bus name found"), 1) + return self.disp(_("Bus name found: [%s]" % bus_name), 1) for method in methods: path, iface, command = method diff --git a/src/plugins/plugin_adhoc_dbus.py b/src/plugins/plugin_adhoc_dbus.py index 2115490d..3b58ca3a 100644 --- a/src/plugins/plugin_adhoc_dbus.py +++ b/src/plugins/plugin_adhoc_dbus.py @@ -130,7 +130,7 @@ class AdHocDBus(object): bus_names = [bus_name for bus_name in bus_names if '.' + prog_name in bus_name] if not bus_names: log.info("Can't find any bus for [%s]" % prog_name) - return + defer.returnValue(("", [])) bus_names.sort() for bus_name in bus_names: if bus_name.endswith(prog_name):