From 6fdfabe4b77e0061c70b77a1996535cbf2050781 Mon Sep 17 00:00:00 2001
From: Fabrice Laporte <kraymer@gmail.com>
Date: Sun, 21 Apr 2013 10:35:08 +0200
Subject: [PATCH] Revert "lastgenre: force real lookup during import only if no
 custom whitelist set."

This reverts commit 4be30fca2e08d63eb4bfc21f7704fb95e5ef4d26.
---
 beetsplug/lastgenre/__init__.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py
index d3e0e7b5f..9b793defe 100644
--- a/beetsplug/lastgenre/__init__.py
+++ b/beetsplug/lastgenre/__init__.py
@@ -39,7 +39,6 @@ log = logging.getLogger('beets')
 
 LASTFM = pylast.LastFMNetwork(api_key=plugins.LASTFM_KEY)
 C14N_TREE = os.path.join(os.path.dirname(__file__), 'genres-tree.yaml')
-WHITELIST = os.path.join(os.path.dirname(__file__), 'genres.txt')
 
 PYLAST_EXCEPTIONS = (
     pylast.WSError,
@@ -199,7 +198,7 @@ class LastGenrePlugin(plugins.BeetsPlugin):
         super(LastGenrePlugin, self).__init__()
 
         self.config.add({
-            'whitelist': WHITELIST,
+            'whitelist': os.path.join(os.path.dirname(__file__), 'genres.txt'),
             'fallback': None,
             'canonical': None,
             'source': 'album',
@@ -348,8 +347,8 @@ class LastGenrePlugin(plugins.BeetsPlugin):
 
     def imported(self, session, task):
         """Event hook called when an import task finishes."""
-        # Force a "real" lookup during import if no custom whitelist set
-        if self.config['whitelist'].get() == WHITELIST:
+        # Always force a "real" lookup during import.
+        if not self.config['force']:
             self.config['force'] = True
 
         if task.is_album: