From 832eafdea1a1602b085d5a3ce0e9fdefb58bb7eb Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 16 Jul 2012 15:43:17 -0400 Subject: [PATCH] CC-4104: airtime-uninstall should not purge airtime database be default -small fix --- install_minimal/airtime-install | 1 + python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 41a508ca1..f7598d7e6 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -151,6 +151,7 @@ if [ "$result" -eq "0" ]; then elif [ "$result" -eq "1" -a "$reinstall" = "f" ]; then echo " * Same version of Airtime already installed! Reusing database." nodb='t' + overwrite='f' elif [ "$result" -eq "2" ]; then echo " * Previous version of Airtime already installed..will perform upgrade." DO_UPGRADE="1" diff --git a/python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py b/python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py index fd7b38646..2ecda5aca 100644 --- a/python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py +++ b/python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py @@ -19,7 +19,7 @@ def generate_liquidsoap_config(ss): val = d[u'value'] val = val if len(val) > 0 else "0" str_buffer = "%s = %s\n" % (key, val) - fh.write(str_buffer) + fh.write(str_buffer.encode('utf-8')) fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/