From 1366b159f2a4bd97208c7157e3beaf05eb39c5fc Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 26 Jul 2011 12:38:19 +0200 Subject: [PATCH] CC-2594 : Set File permissions on organized/imported when moving stor dir to have www-data as owner etc --- .../media-monitor/airtimefilemonitor/airtimenotifier.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py index acbe3602b..7c4e706f8 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py @@ -92,8 +92,6 @@ class AirtimeNotifier(Notifier): self.logger.info("Removing watch on: %s wd %s", storage_directory, wd) mm.wm.rm_watch(wd, rec=True) - self.mmc.set_needed_file_permissions(new_storage_directory, True) - self.bootstrap.sync_database_to_filesystem(new_storage_directory_id, new_storage_directory) self.config.storage_directory = os.path.normpath(new_storage_directory) @@ -104,6 +102,10 @@ class AirtimeNotifier(Notifier): self.mmc.ensure_is_dir(self.config.imported_directory) self.mmc.ensure_is_dir(self.config.organize_directory) + self.mmc.set_needed_file_permissions(self.config.storage_directory, True) + self.mmc.set_needed_file_permissions(self.config.imported_directory, True) + self.mmc.set_needed_file_permissions(self.config.organize_directory, True) + self.watch_directory(new_storage_directory) elif m['event_type'] == "file_delete": filepath = m['filepath'].encode('utf-8')