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

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

Browse source
This commit is contained in:
james 2011-07-13 16:05:52 -04:00
commit 01eec838f0
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
install/include/airtime-upgrade.php
View file

@ -68,10 +68,10 @@ echo "******************************** Update Begin ****************************
$version = substr($version, 0, 5);
if (strcmp($version, "1.7.0") < 0){
system("php ".__DIR__."/../upgrades/airtime-1.7/airtime-upgrade.php");
system("php ".__DIR__."/../upgrades/airtime-1.7.0/airtime-upgrade.php");
}
if (strcmp($version, "1.8.0") < 0){
system("php ".__DIR__."/../upgrades/airtime-1.8/airtime-upgrade.php");
system("php ".__DIR__."/../upgrades/airtime-1.8.0/airtime-upgrade.php");
}
if (strcmp($version, "1.8.1") < 0){
system("php ".__DIR__."/../upgrades/airtime-1.8.1/airtime-upgrade.php");
@ -80,7 +80,7 @@ if (strcmp($version, "1.8.2") < 0){
system("php ".__DIR__."/../upgrades/airtime-1.8.2/airtime-upgrade.php");
}
if (strcmp($version, "1.9.0") < 0){
system("php ".__DIR__."/../upgrades/airtime-1.9/airtime-upgrade.php");
system("php ".__DIR__."/../upgrades/airtime-1.9.0/airtime-upgrade.php");
}

0
install/upgrades/airtime-1.7/airtime-upgrade.php → install/upgrades/airtime-1.7.0/airtime-upgrade.php
View file

0
install/upgrades/airtime-1.8/airtime-upgrade.php → install/upgrades/airtime-1.8.0/airtime-upgrade.php
View file

0
install/upgrades/airtime-1.9/airtime-upgrade.php → install/upgrades/airtime-1.9.0/airtime-upgrade.php
View file

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

@ -74,7 +74,7 @@ class AirtimeMediaMonitorBootstrap():
all_files_set = set()
for file_path in new_files:
if len(file_path.strip(" \n")) > 0:
all_files_set.add(file_path[len(dir)+1:])
all_files_set.add(file_path[len(dir):])
if os.path.exists(self.pe.timestamp_file):
"""find files that have been modified since the last time media-monitor process started."""
@ -124,4 +124,4 @@ class AirtimeMediaMonitorBootstrap():
file_path = "%s/%s" % (dir, file_path)
if os.path.exists(file_path):
self.pe.handle_modified_file(False, os.path.basename(file_path), file_path)