Merge branch 'martin' into 2.3.x

2013-01-29 12:17:36 -05:00 · 2013-01-29 12:17:36 -05:00 · 9d4e0d2dd1
commit 9d4e0d2dd1
parent db4e6bb94a 28c01760dd
3 changed files with 55 additions and 20 deletions
--- a/python_apps/pypo/liquidsoap_scripts/liquidsoap_prepare_terminate.py
+++ b/python_apps/pypo/liquidsoap_scripts/liquidsoap_prepare_terminate.py
@ -6,14 +6,14 @@ try:
    config = ConfigObj('/etc/airtime/pypo.cfg')
    LS_HOST = config['ls_host']
    LS_PORT = config['ls_port']
-    
+
    tn = telnetlib.Telnet(LS_HOST, LS_PORT)
    tn.write("master_harbor.stop\n")
    tn.write("live_dj_harbor.stop\n")
    tn.write('exit\n')
    tn.read_all()
-    
+
 except Exception, e:
    print('Error loading config file: %s', e)
    sys.exit()
-    
+