summaryrefslogtreecommitdiff
path: root/fs/remote.py
diff options
context:
space:
mode:
authorrfkelly0 <rfkelly0@67cdc799-7952-0410-af00-57a81ceafa0f>2010-01-19 03:52:08 +0000
committerrfkelly0 <rfkelly0@67cdc799-7952-0410-af00-57a81ceafa0f>2010-01-19 03:52:08 +0000
commit94ca0e25c3846d21a06b2e520e6eb248b2ca5f2e (patch)
tree1eb85c6517bee78133f56d7d19b782bd97711b6f /fs/remote.py
parent751c0d74a34bf67f9fed56b25ca5c566bdac7059 (diff)
downloadpyfilesystem-94ca0e25c3846d21a06b2e520e6eb248b2ca5f2e.tar.gz
ConnectionManagerFS: make wait_for_connection exit on FS close
git-svn-id: http://pyfilesystem.googlecode.com/svn/trunk@320 67cdc799-7952-0410-af00-57a81ceafa0f
Diffstat (limited to 'fs/remote.py')
-rw-r--r--fs/remote.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/remote.py b/fs/remote.py
index ca435e9..9d844a1 100644
--- a/fs/remote.py
+++ b/fs/remote.py
@@ -232,7 +232,7 @@ class ConnectionManagerFS(LazyFS):
self._connection_cond.release()
def _poll_connection(self):
- while not self.connected:
+ while not self.connected and not self.closed:
try:
self.wrapped_fs.isdir("")
except RemoteConnectionError:
@@ -244,7 +244,8 @@ class ConnectionManagerFS(LazyFS):
break
self._connection_cond.acquire()
try:
- self.connected = True
+ if not self.closed:
+ self.connected = True
self._poll_thread = None
self._connection_cond.notifyAll()
finally: