Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
This commit is contained in:
martin 2011-10-04 14:01:48 -04:00
commit cb3060623c
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View file

@ -38,7 +38,6 @@ class AirtimeProcessEvent(ProcessEvent):
self.api_client = api_client
self.create_dict = {}
def add_filepath_to_ignore(self, filepath):
self.ignore_event.add(filepath)
@ -110,7 +109,6 @@ class AirtimeProcessEvent(ProcessEvent):
# detele corresponding entry from create_dict
self.create_dict.pop(event.pathname)
self.handle_created_file(event.dir, event.pathname, event.name)
def handle_created_file(self, dir, pathname, name):
if not dir: