From c0131894f25b2537c7787be5c8d018a351108a84 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Tue, 2 Dec 2014 18:05:47 -0800 Subject: [PATCH] Changelog for #1123/#1128 --- beets/ui/__init__.py | 5 +++-- docs/changelog.rst | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py index b93d168ab..8978ff547 100644 --- a/beets/ui/__init__.py +++ b/beets/ui/__init__.py @@ -921,8 +921,9 @@ def _raw_main(args, lib=None): options, subargs = parser.parse_global_options(args) - # Bypass _setup so that an invalid configuration does not prevent - # the editor from starting. + # Special case for the `config --edit` command: bypass _setup so + # that an invalid configuration does not prevent the editor from + # starting. if subargs[0] == 'config' and ('-e' in subargs or '--edit' in subargs): from beets.ui.commands import config_edit return config_edit() diff --git a/docs/changelog.rst b/docs/changelog.rst index 210c76cd6..bbb3e1810 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -13,6 +13,8 @@ New: * Add a warning when importing a directory that contains no music. :bug:`1116` :bug:`1127` * The :doc:`/plugins/zero` can remove embedded images. :bug:`1129` :bug:`1100` +* The :ref:`config-cmd` command can now be used to edit the configuration even + when it has syntax errors. :bug:`1123` :bug:`1128` Fixed: