From e3761bd8d6b1d2fe53df1ed9c30106f45333daf9 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 3 Dec 2012 16:33:24 -0500 Subject: [PATCH 1/2] -make sure lsof works for files with spaces --- python_apps/media-monitor2/media/monitor/pure.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index a879f449f..8f1189bec 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -162,8 +162,7 @@ def walk_supported(directory, clean_empties=False): def file_locked(path): - cmd = "lsof %s" % path - f = Popen(cmd, shell=True, stdout=PIPE).stdout + f = Popen(["lsof", path], stdout=PIPE).stdout return bool(f.readlines()) def magic_move(old, new, after_dir_make=lambda : None): From 735ad304837695f8f5d72208899b2f223b399d3e Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 3 Dec 2012 16:56:11 -0500 Subject: [PATCH 2/2] CC-4726: Sometimes mm doesn't start after a fresh install -fixed --- python_apps/media-monitor2/media/monitor/pure.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 8f1189bec..958e1d950 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -154,6 +154,9 @@ def walk_supported(directory, clean_empties=False): that support the extensions we are considering. When clean_empties is True we recursively delete empty directories left over in directory after the walk. """ + if directory is None: + return + for root, dirs, files in os.walk(directory): full_paths = ( os.path.join(root, name) for name in files if is_file_supported(name) )