Merge branch 'release/v0.19.x' into develop

This commit is contained in:
Stein Magnus Jodal 2014-12-23 22:58:54 +01:00
commit c8c44c868b
2 changed files with 12 additions and 5 deletions

View File

@ -75,12 +75,16 @@ v0.19.5 (UNRELEASED)
Bug fix release.
- config: Support UTF-8 in default config. If an extension with non-ASCII
- Config: Support UTF-8 in default config. If an extension with non-ASCII
characters in its default config was installed, and Mopidy didn't already
have a config file, Mopidy would crashed when trying to create the initial
config file based on the default config of all available extensions.
(Fixes: :discuss:`428`)
- Extensions: Fix crash when unpacking data from
:exc:`pkg_resources.VersionConflict` created with a single argument. (Fixes:
:issue:`911`)
- Models: Hide empty collections from :func:`repr()` representations.
- Models: Field values are no longer stored on the model instance when the

View File

@ -188,10 +188,13 @@ def validate_extension(extension):
extension.ext_name, ex)
return False
except pkg_resources.VersionConflict as ex:
found, required = ex.args
logger.info(
'Disabled extension %s: %s required, but found %s at %s',
extension.ext_name, required, found, found.location)
if len(ex.args) == 2:
found, required = ex.args
logger.info(
'Disabled extension %s: %s required, but found %s at %s',
extension.ext_name, required, found, found.location)
else:
logger.info('Disabled extension %s: %s', extension.ext_name, ex)
return False
try: