From 35cc1dcb34a8c96d1fcf50ee6467907e8d56addc Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 9 Jun 2011 17:00:48 +0200
Subject: [PATCH] Do not print stack trace on settings validation error

---
 mopidy/core.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mopidy/core.py b/mopidy/core.py
index e510b698..ca5b92a1 100644
--- a/mopidy/core.py
+++ b/mopidy/core.py
@@ -16,7 +16,8 @@ sys.argv[1:] = gstreamer_args
 
 from pykka.registry import ActorRegistry
 
-from mopidy import get_version, settings, OptionalDependencyError
+from mopidy import (get_version, settings, OptionalDependencyError,
+    SettingsError)
 from mopidy.gstreamer import GStreamer
 from mopidy.utils import get_class
 from mopidy.utils.log import setup_logging
@@ -65,7 +66,11 @@ def parse_options():
 def setup_settings():
     get_or_create_folder('~/.mopidy/')
     get_or_create_file('~/.mopidy/settings.py')
-    settings.validate()
+    try:
+        settings.validate()
+    except SettingsError, e:
+        logger.error(e.message)
+        sys.exit(1)
 
 def setup_gobject_loop():
     GObjectEventThread().start()