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

Merge.

Browse Source
This commit is contained in:
Dan O'Reilly
2009-03-01 21:50:18 -05:00
parent cafde692e5 edbfd18553
commit f66ec767fe
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wicd/networking.py
View File

@@ -45,7 +45,6 @@ import re
import time import time
import threading import threading
import os import os
import thread
from signal import SIGTERM from signal import SIGTERM
# wicd imports # wicd imports
@@ -269,7 +268,7 @@ class ConnectThread(threading.Thread):
is_connecting = None is_connecting = None
should_die = False should_die = False
lock = thread.allocate_lock() lock = threading.Lock()
def __init__(self, network, interface_name, before_script, after_script, def __init__(self, network, interface_name, before_script, after_script,
disconnect_script, gdns1, gdns2, gdns3, gdns_dom, gsearch_dom, disconnect_script, gdns1, gdns2, gdns3, gdns_dom, gsearch_dom,
@@ -477,7 +476,7 @@ class ConnectThread(threading.Thread):
try: try:
if self._should_die: if self._should_die:
self.connect_aborted('aborted') self.connect_aborted('aborted')
thread.exit() raise SystemExit
finally: finally:
self.lock.release() self.lock.release()