From 15add196f2022bb4604f9ab3f8d0094691a09db8 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Fri, 26 Oct 2012 21:00:57 -0700
Subject: [PATCH] track down a few more misuses of confit

---
 beets/config_default.yaml | 1 +
 beets/importer.py         | 2 +-
 beets/library.py          | 2 +-
 beets/ui/__init__.py      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/beets/config_default.yaml b/beets/config_default.yaml
index 4012d98cb..bc02bbb5a 100644
--- a/beets/config_default.yaml
+++ b/beets/config_default.yaml
@@ -5,6 +5,7 @@ import:
     write: yes
     copy: yes
     move: no
+    delete: no
     resume: ask
     incremental: no
     quiet_fallback: skip
diff --git a/beets/importer.py b/beets/importer.py
index 248f05c89..4453fa158 100644
--- a/beets/importer.py
+++ b/beets/importer.py
@@ -841,7 +841,7 @@ def manipulate_files(session):
                     # old paths.
                     session.lib.move(item, True)
 
-            if config['import']['write '] and task.should_write_tags():
+            if config['import']['write'] and task.should_write_tags():
                 item.write()
 
         # Save new paths.
diff --git a/beets/library.py b/beets/library.py
index d767331fb..fbffd08c6 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -275,7 +275,7 @@ class Item(object):
             read_path = normpath(read_path)
         try:
             f = MediaFile(syspath(read_path))
-        except Exception:
+        except Exception as exc:
             log.error(u'failed reading file: {0}'.format(
                 displayable_path(read_path))
             )
diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index 81c254ec4..183e1c77c 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -670,7 +670,7 @@ def main(args=None, configfh=None):
         exc.log(log)
         sys.exit(1)
     except confit.ConfigError as exc:
-        FIXME
+        log.error(u'configuration error: {0}'.format(exc))
     except IOError as exc:
         if exc.errno == errno.EPIPE:
             # "Broken pipe". End silently.