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:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
This commit is contained in:
james 2011-08-26 12:56:10 -04:00
commit 56ad8c6b3d
17 changed files with 545 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_apps/pypo/pypofetch.py
View file

@ -477,7 +477,8 @@ class PypoFetch(Thread):
# most recent schedule. After that we can just wait for updates.
status, self.schedule_data = self.api_client.get_schedule()
if status == 1:
self.process_schedule(self.schedule_data , "scheduler", True)
logger.info("Bootstrap schedule received: %s", schedule_data)
self.process_schedule(schedule_data, "scheduler", True)
logger.info("Bootstrap complete: got initial copy of the schedule")
loops = 1