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

Merge branch '2.0.x' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
This commit is contained in:
Martin Konecny 2012-04-12 19:08:55 -04:00
commit f96b990275
23 changed files with 121 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_apps/pypo/install/pypo-copy-files.py
View file

@ -27,6 +27,9 @@ def create_dir(path):
os.makedirs(path)
except Exception, e:
pass
def get_rand_string(length=10):
return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(length))
def get_rand_string(length=10):
return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(length))

4
python_apps/pypo/pypopush.py
View file

@ -224,10 +224,6 @@ class PypoPush(Thread):
problem_start_time = queue_item['start']
break
iteration+=1
return (problem_at_iteration, problem_start_time)