summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-04-14 07:13:52 +0200
committerFlorian Bruhin <git@the-compiler.org>2015-04-14 07:13:52 +0200
commitd8d29449ca546458131596e2229a1e3d163e326e (patch)
tree62245727d0d148288b73473a3308eda08c74c2e7
parentf6b88770d1395b4d91ce069480145b7c678cfe21 (diff)
downloadqutebrowser-d8d29449ca546458131596e2229a1e3d163e326e.tar.gz
qutebrowser-d8d29449ca546458131596e2229a1e3d163e326e.zip
Improve error message on duplicate keychains.
-rw-r--r--qutebrowser/config/parsers/keyconf.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/qutebrowser/config/parsers/keyconf.py b/qutebrowser/config/parsers/keyconf.py
index e43dc07e9..6638f8d20 100644
--- a/qutebrowser/config/parsers/keyconf.py
+++ b/qutebrowser/config/parsers/keyconf.py
@@ -46,6 +46,10 @@ class DuplicateKeychainError(KeyConfigError):
"""Error raised when there's a duplicate key binding."""
+ def __init__(self, keychain):
+ super().__init__("Duplicate key chain {}!".format(keychain))
+ self.keychain = keychain
+
class KeyConfigParser(QObject):
@@ -164,7 +168,7 @@ class KeyConfigParser(QObject):
self._add_binding(mode, key, command, force=force)
except DuplicateKeychainError as e:
raise cmdexc.CommandError("Duplicate keychain {} - use --force to "
- "override!".format(str(e)))
+ "override!".format(str(e.keychain)))
except KeyConfigError as e:
raise cmdexc.CommandError(e)
for m in mode.split(','):