Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into devel

This commit is contained in:
Martin Konecny 2013-02-22 12:09:02 -05:00
parent 4ce25d067d 57183b8ac8
commit b06fd8b3d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python_apps/media-monitor2/media/monitor/pure.py
View File

@ -166,8 +166,9 @@ def walk_supported(directory, clean_empties=False):
def file_locked(path): def file_locked(path):
f = Popen(["lsof", path], stdout=PIPE).stdout proc = Popen(["lsof", path], stdout=PIPE)
return bool(f.readlines()) out = proc.communicate()[0].strip('\r\n')
return bool(out)
def magic_move(old, new, after_dir_make=lambda : None): def magic_move(old, new, after_dir_make=lambda : None):
""" Moves path old to new and constructs the necessary to """ Moves path old to new and constructs the necessary to