Merge remote-tracking branch 'origin/master'

Conflicts:
	beets/importer.py
	beets/ui/commands.py
	beetsplug/lyrics.py
This commit is contained in:
e5e4eaeacd39c5cfba4d7c852c48277ae50331e6 2014-09-09 12:05:38 +10:00
commit d3386df056

View file

@ -778,7 +778,7 @@ class TerminalImportSession(importer.ImportSession):
that's already in the library.
"""
log.warn(u"This {0} is already in the library!"
.format('album' if task.is_album else 'item'))
.format("album" if task.is_album else "item"))
if config['import']['quiet']:
# In quiet mode, don't prompt -- just skip.