Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention

Conflicts:
	python_apps/media-monitor/MediaMonitor.py
This commit is contained in:
Naomi Aro 2011-06-06 11:22:40 +02:00
commit cb2ca87516
1 changed files with 1 additions and 1 deletions

View File

@ -250,8 +250,8 @@ class MediaMonitor(ProcessEvent):
def process_IN_CREATE(self, event):
if not event.dir:
if not event.dir :
#file created is a tmp file which will be modified and then moved back to the original filename.
if self.is_temp_file(event.name) :
self.temp_files[event.pathname] = None