gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-09 23:34:17 +01:00
Code Issues Projects Releases Wiki Activity

Wireless network interface should only be auto-detected when nothing is specified in /etc/wicd/manager-settings.conf

Browse Source 
If the user makes this empty, it will not be autodetected anymore.
This commit is contained in:
Tom Van Braeckel
2015-02-12 18:01:42 +01:00
parent 513a1a2215
commit 29c12dc0d2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wicd/configmanager.py
View File

@@ -113,8 +113,7 @@ class ConfigManager(RawConfigParser):
else:
return None
# If the option is present and not empty
if self.has_option(section, option) and RawConfigParser.get(self, section, option) != "None":
if self.has_option(section, option):
ret = RawConfigParser.get(self, section, option)
if (isinstance(ret, basestring) and ret.startswith(self.mrk_ws)
and ret.endswith(self.mrk_ws)):
@@ -131,7 +130,7 @@ class ConfigManager(RawConfigParser):
else:
print ''.join(['found ', option, ' in configuration ',
str(ret)])
else:
else: # Use the default, unless no default was provided
if default != "__None__":
print 'did not find %s in configuration, setting default %s' \
% (option, str(default))

2
wicd/wicd-daemon.py
View File

@@ -162,6 +162,7 @@ class WicdDaemon(dbus.service.Object, object):
def SetWiredInterface(self, interface):
""" Sets the wired interface for the daemon to use. """
print "setting wired interface %s" % (str(interface))
# Set it to a blank string, otherwise a network card named "None" will be searched
self.wired.wired_interface = noneToBlankString(interface)
self.config.set("Settings", "wired_interface", interface, write=True)
@@ -169,6 +170,7 @@ class WicdDaemon(dbus.service.Object, object):
def SetWirelessInterface(self, interface):
""" Sets the wireless interface the daemon will use. """
print "setting wireless interface %s" % (str(interface))
# Set it to a blank string, otherwise a network card named "None" will be searched
self.wifi.wireless_interface = noneToBlankString(interface)
self.config.set("Settings", "wireless_interface", interface, write=True)