Merge branch '2.3.x' into devel

2013-02-22 12:09:02 -05:00 · 2013-02-22 12:09:02 -05:00 · b06fd8b3d3
parent 4ce25d067d 57183b8ac8
commit b06fd8b3d3
1 changed files with 3 additions and 2 deletions
--- a/python_apps/media-monitor2/media/monitor/pure.py
+++ b/python_apps/media-monitor2/media/monitor/pure.py
@ -166,8 +166,9 @@ def walk_supported(directory, clean_empties=False):


 def file_locked(path):
-    f = Popen(["lsof", path], stdout=PIPE).stdout
-    return bool(f.readlines())
+    proc = Popen(["lsof", path], stdout=PIPE)
+    out = proc.communicate()[0].strip('\r\n')
+    return bool(out)

 def magic_move(old, new, after_dir_make=lambda : None):
    """ Moves path old to new and constructs the necessary to