From 11c1c48b92ec66df8a96ae42416c811232058110 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Tue, 3 Feb 2009 19:35:57 -0500 Subject: [PATCH 1/3] Make sure we try each external app in order if selection is set to be automatic. --- wicd/backends/be-external.py | 6 +++--- wicd/backends/be-ioctl.py | 4 ++-- wicd/wnettools.py | 17 +++++++---------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/wicd/backends/be-external.py b/wicd/backends/be-external.py index b96880c..d3dc90c 100644 --- a/wicd/backends/be-external.py +++ b/wicd/backends/be-external.py @@ -194,10 +194,10 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface): except (IOError, ValueError, TypeError): print 'Error checking link using /sys/class/net/%s/carrier' % self.iface - if self.miitool_cmd and self.link_detect == misc.MIITOOL: - return self._mii_get_plugged_in() - elif self.ethtool_cmd: + if self.ethtool_cmd and self.link_detect in [misc.ETHTOOL, misc.AUTO]: return self._eth_get_plugged_in() + 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.' diff --git a/wicd/backends/be-ioctl.py b/wicd/backends/be-ioctl.py index b43f6d6..e8ab7f8 100644 --- a/wicd/backends/be-ioctl.py +++ b/wicd/backends/be-ioctl.py @@ -191,9 +191,9 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface): """ if not self.iface: return False - if self.ethtool_cmd and self.link_detect != misc.MIITOOL: + if self.ethtool_cmd and self.link_detect in [misc.ETHTOOL, misc.AUTO]: return self._eth_get_plugged_in() - elif self.miitool_cmd: + 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 \ diff --git a/wicd/wnettools.py b/wicd/wnettools.py index b4bb5f6..dff9973 100644 --- a/wicd/wnettools.py +++ b/wicd/wnettools.py @@ -208,16 +208,13 @@ class BaseInterface(object): """ def get_client_name(cl): """ Converts the integer value for a dhcp client to a string. """ - if (cl in [misc.DHCLIENT, "dhclient"] or - (cl == misc.AUTO and self.dhclient_cmd)): + if self.dhclient_cmd and cl in [misc.DHCLIENT, misc.AUTO]: client = "dhclient" cmd = self.dhclient_cmd - elif (cl in [misc.DHCPCD, "dhcpcd"] or - (cl == misc.AUTO and self.dhcpcd_cmd)): + elif self.dhcpcd_cmd and cl in [misc.DHCPCD, misc.AUTO]: client = "dhcpcd" cmd = self.dhcpcd_cmd - elif (cl in [misc.PUMP, "pump"] or - (cl == misc.AUTO and self.pump_cmd)): + elif self.pump_cmd and cl in [misc.PUMP, misc.AUTO]: client = "pump" cmd = self.pump_cmd else: @@ -482,12 +479,12 @@ class BaseInterface(object): def FlushRoutes(self): """ Flush all network routes. """ if not self.iface: return False - if self.route_cmd and self.flush_tool == misc.ROUTE: - cmds = ['%s del default' % self.route_cmd] - cmds.append('route del dev %s' % self.iface) - elif self.ip_cmd: + if self.ip_cmd and self.flush_tool in [misc.AUTO, misc.IP]: #cmd = "ip route flush dev " + self.iface cmds = ['%s route flush all' % self.ip_cmd] + elif self.route_cmd and self.flush_tool in [misc.AUTO, misc.ROUTE]: + cmds = ['%s del default' % self.route_cmd] + cmds.append('route del dev %s' % self.iface) else: print "No flush command available!" cmds = [] From 5a6bdbdef48d2cbdfbcb132e27fd089c204d44d9 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Tue, 3 Feb 2009 19:38:07 -0500 Subject: [PATCH 2/3] Remove unneeded parameter from PreferencesDialog constructor. --- wicd/gui.py | 3 +-- wicd/prefs.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wicd/gui.py b/wicd/gui.py index 8cb6497..0eb6d45 100644 --- a/wicd/gui.py +++ b/wicd/gui.py @@ -300,8 +300,7 @@ class appGui(object): def settings_dialog(self, widget, event=None): """ Displays a general settings dialog. """ if not self.pref: - self.pref = PreferencesDialog(self.wTree, - dbusmanager.get_dbus_ifaces()) + self.pref = PreferencesDialog(self.wTree) else: self.pref.load_preferences_diag() if self.pref.run() == 1: diff --git a/wicd/prefs.py b/wicd/prefs.py index 8ec7ae1..2adfc6d 100644 --- a/wicd/prefs.py +++ b/wicd/prefs.py @@ -49,7 +49,7 @@ def setup_dbus(): class PreferencesDialog(object): """ Class for handling the wicd preferences dialog window. """ - def __init__(self, wTree, dbus): + def __init__(self, wTree): setup_dbus() self.wTree = wTree self.prep_settings_diag() From 2efc04091d0774a5e4d1eac4b3ef802cd5b2121e Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Tue, 3 Feb 2009 19:59:53 -0500 Subject: [PATCH 3/3] Add a .bzrignore file. --- .bzrignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .bzrignore diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 0000000..e1b9094 --- /dev/null +++ b/.bzrignore @@ -0,0 +1,4 @@ +experimental.wpr +install.log +uninstall.log +.bzrignore