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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-05-25 16:23:41 -04:00
parent 561934c8ef 910f8e8627
commit 0797876ff8
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install_minimal/upgrades/airtime-2.1.0/data/upgrade.sql
View File

@ -106,6 +106,7 @@ ALTER TABLE cc_show_instances
ALTER COLUMN time_filled TYPE interval /* TYPE change - table: cc_show_instances original: time without time zone new: interval */,
ALTER COLUMN time_filled SET DEFAULT '00:00:00'::interval;
UPDATE cc_show_instances SET time_filled = '00:00:00' WHERE time_filled is NULL;
UPDATE cc_show_instances SET created = now();
UPDATE cc_show_instances SET last_scheduled = now();

4
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
View File

@ -77,6 +77,10 @@ class AirtimeMediaMonitorBootstrap():
dir -- pathname of the directory
"""
def sync_database_to_filesystem(self, dir_id, dir):
dir = os.path.normpath(dir)+"/"
"""
set to hold new and/or modified files. We use a set to make it ok if files are added
twice. This is because some of the tests for new files return result sets that are not