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

-check whether getdefaultlocale actually returns a value before attempting to use it.

Browse source
This commit is contained in:
Martin Konecny 2012-04-26 17:59:25 -04:00
parent 773206ab22
commit da7b87866c
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
python_apps/media-monitor/media_monitor.py
View file

@ -41,12 +41,15 @@ logger.info("\n\n*** Media Monitor bootup ***\n\n")
try: try:
fs_encoding = locale.getdefaultlocale()[1].lower() fs_encoding = locale.getdefaultlocale()[1]
if fs_encoding not in ['utf-8', 'utf8']: if fs_encoding is not None:
logger.error("Filesystem encoding needs to be UTF-8. Currently '%s'. Exiting..." % fs_encoding) if fs_encoding not in ['utf-8', 'utf8']:
sys.exit(1) logger.error("Filesystem encoding needs to be UTF-8. Currently '%s'. Exiting..." % fs_encoding)
sys.exit(1)
else:
logger.debug("Filesystem encoding: '%s'" % fs_encoding)
else: else:
logger.debug("Filesystem encoding: '%s'" % fs_encoding) logger.debug("Unknown encoding")
config = AirtimeMediaConfig(logger) config = AirtimeMediaConfig(logger)