From cadf0acac7cebaa12a765875f72f4d8b8820066b Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 19:53:07 -0400 Subject: [PATCH] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -fix utf-8 check --- python_apps/media-monitor/airtime-media-monitor | 4 ++-- python_apps/pypo/airtime-playout | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/airtime-media-monitor index 9fb0ce262..6bb450c62 100755 --- a/python_apps/media-monitor/airtime-media-monitor +++ b/python_apps/media-monitor/airtime-media-monitor @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # Location of pypo_cli.py Python script @@ -18,7 +18,7 @@ set +e cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" set -e if [ "$?" != "0" ]; then - echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/pypo/error.log + echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/media-monitor/error.log exit 1 fi diff --git a/python_apps/pypo/airtime-playout b/python_apps/pypo/airtime-playout index f6d11df11..09ee51a91 100755 --- a/python_apps/pypo/airtime-playout +++ b/python_apps/pypo/airtime-playout @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" . ${virtualenv_bin}activate