Fix bug where link detection tool value wasn't get propogated down the stack.
This commit is contained in:
1 parent
227704f137
commit
3fe1bca50e
3 files changed
+5
-5
No files matched your search
@@ -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):
|
||||
|
||||
@@ -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):
|
||||
|
||||
+1
-1
@@ -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')
|
||||
|
||||
Reference in new issue
Block a user