Adrian Sampson avatar Adrian Sampson committed 842db7f

don't crash when config file is empty

Comments (0)

Files changed (2)

beets/util/confit.py

         for appdir in self._search_dirs():
             filename = os.path.join(appdir, CONFIG_FILENAME)
             if os.path.isfile(filename):
-                yield ConfigSource(load_yaml(filename), filename)
+                yield ConfigSource(load_yaml(filename) or {}, filename)
 
     def _default_source(self):
         """Return the default-value source for this program or `None` if

docs/changelog.rst

   exiting with an exception. We also avoid an error when track metadata
   contains newlines.
 * Fix a crash when iTunes Sound Check tags contained invalid data.
+* Fix an error when the configuration file (``config.yaml``) is completely
+  empty.
 
 1.1b2 (February 16, 2013)
 -------------------------
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.