gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-02-24 03:05:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug introduced in r356 where wicd would crash upon not finding dhclient.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-04-21 13:34:01 -04:00
parent 8014a2b16a
commit 72e6bb73de
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wicd/wnettools.py
View File

@@ -296,11 +296,13 @@ class BaseInterface(object):
""" """
self.dhclient_cmd = self._find_program_path("dhclient") self.dhclient_cmd = self._find_program_path("dhclient")
output = misc.Run(self.dhclient_cmd + " --version", include_stderr=True) if self.dhclient_cmd != None:
if '4.' in output: output = misc.Run(self.dhclient_cmd + " --version",
self.dhclient_needs_verbose = True include_stderr=True)
else: if '4.' in output:
self.dhclient_needs_verbose = False self.dhclient_needs_verbose = True
else:
self.dhclient_needs_verbose = False
self.dhcpcd_cmd = self._find_program_path("dhcpcd") self.dhcpcd_cmd = self._find_program_path("dhcpcd")
self.pump_cmd = self._find_program_path("pump") self.pump_cmd = self._find_program_path("pump")