Merge branch '2.4.x' into 2.4.x-saas

2013-07-22 11:02:35 -04:00 · 2013-07-22 11:02:35 -04:00 · 694e3101a8
parent 18bb477845 de76b3a12f
commit 694e3101a8
1 changed files with 2 additions and 1 deletions
--- a/python_apps/pypo/pypofetch.py
+++ b/python_apps/pypo/pypofetch.py
@ -209,7 +209,8 @@ class PypoFetch(Thread):
        except Exception, e:
            self.logger.error(e)
        finally:
-            self.telnet_lock.release()
+            if self.telnet_lock.locked():
+                self.telnet_lock.release()

    """
    TODO: This function needs to be way shorter, and refactored :/ - MK