gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-07 06:14:16 +01:00
Code Issues Projects Releases Wiki Activity

Fix annoying KeyError bug if no prior dhcp hostname has been set.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-11-26 00:01:07 -05:00
parent c51f2b423f
commit f7d39b249d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wicd/networking.py
View File

@@ -448,6 +448,8 @@ class ConnectThread(threading.Thread):
else: else:
# Run dhcp... # Run dhcp...
self.SetStatus('running_dhcp') self.SetStatus('running_dhcp')
if self.network.get('dhcphostname') == None:
self.network['dhcphostname'] = os.uname()[1]
print "Running DHCP with hostname",self.network["dhcphostname"] print "Running DHCP with hostname",self.network["dhcphostname"]
dhcp_status = iface.StartDHCP(self.network["dhcphostname"]) dhcp_status = iface.StartDHCP(self.network["dhcphostname"])
if dhcp_status in ['no_dhcp_offers', 'dhcp_failed']: if dhcp_status in ['no_dhcp_offers', 'dhcp_failed']:

2
wicd/wnettools.py
View File

@@ -328,6 +328,8 @@ class BaseInterface(object):
return "" return ""
if flavor == "connect": if flavor == "connect":
if not hostname:
hostname = os.uname()[1]
return client_dict[client_name]['connect'] % \ return client_dict[client_name]['connect'] % \
{ "cmd" : cmd, { "cmd" : cmd,
"iface" : self.iface, "iface" : self.iface,