From 9f24c331a4ea2237579dce9b6f06390ad2b10411 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 15 Aug 2015 23:08:32 +0200
Subject: [PATCH 1/2] file: Adjust file/media_dirs failure logging

Fixes #1249
---
 mopidy/file/library.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mopidy/file/library.py b/mopidy/file/library.py
index 691020b4..d477d109 100644
--- a/mopidy/file/library.py
+++ b/mopidy/file/library.py
@@ -108,12 +108,15 @@ class FileLibraryProvider(backend.LibraryProvider):
                 media_dir_split[0].encode(FS_ENCODING))
 
             if not local_path:
-                logger.warning('Failed expanding path (%s) from '
-                               'file/media_dirs config value.',
-                               media_dir_split[0])
+                logger.debug(
+                    'Failed expanding path (%s) from file/media_dirs config '
+                    'value.',
+                    media_dir_split[0])
                 continue
             elif not os.path.isdir(local_path):
-                logger.warning('%s is not a directory', local_path)
+                logger.warning(
+                    '%s is not a directory. Please create the directory or '
+                    'update the file/media_dirs config value.', local_path)
                 continue
 
             media_dir['path'] = local_path

From 306b2f331fba29c073ce07691d1408e139c8914d Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 15 Aug 2015 23:11:47 +0200
Subject: [PATCH 2/2] docs: Add #1249/#1255 to changelog

---
 docs/changelog.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 75fdc538..7a604526 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,18 @@ Changelog
 
 This changelog is used to track all major changes to Mopidy.
 
+
+v1.1.1 (UNRELEASED)
+===================
+
+Bug fix release.
+
+- File: Adjust log levels when failing to expand ``$XDG_MUSIC_DIR`` into a real
+  path. This usually happens when running Mopidy as a system service, and thus
+  with a limited set of environment variables. (Fixes: :issue:`1249`, PR:
+  :issue:`1255`)
+
+
 v1.1.0 (2015-08-09)
 ===================