From 3fe1bca50ef1c7b227b951056d06ffe099b80b01 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Tue, 3 Feb 2009 23:48:58 -0500 Subject: [PATCH] Fix bug where link detection tool value wasn't get propogated down the stack. --- wicd/backends/be-external.py | 4 ++-- wicd/backends/be-ioctl.py | 4 ++-- wicd/wicd-daemon.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wicd/backends/be-external.py b/wicd/backends/be-external.py index d3dc90c..d4180fc 100644 --- a/wicd/backends/be-external.py +++ b/wicd/backends/be-external.py @@ -199,8 +199,8 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface): elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]: return self._mii_get_plugged_in() else: - print 'Error: No way of checking for a wired connection. Make ' + \ - 'sure that either mii-tool or ethtool is installed.' + print ('Error: No way of checking for a wired connection. Make ' + + 'sure that either mii-tool or ethtool is installed.') return False def _eth_get_plugged_in(self): diff --git a/wicd/backends/be-ioctl.py b/wicd/backends/be-ioctl.py index e8ab7f8..d0c5fe2 100644 --- a/wicd/backends/be-ioctl.py +++ b/wicd/backends/be-ioctl.py @@ -196,8 +196,8 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface): elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]: return self._mii_get_plugged_in() else: - print 'Error: No way of checking for a wired connection. Make \ - sure that either mii-tool or ethtool is installed.' + print ('Error: No way of checking for a wired connection. Make' + + 'sure that either mii-tool or ethtool is installed.') return False def _eth_get_plugged_in(self): diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index 876c33f..481b30a 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -616,7 +616,7 @@ class WicdDaemon(dbus.service.Object): """ self.link_detect_tool = int(link_tool) - self.wired.link_tool = int(link_tool) + self.wired.link_detect = int(link_tool) self.config.set("Settings", "link_detect_tool", link_tool, write=True) @dbus.service.method('org.wicd.daemon')