Mercurial > kallithea
changeset 6612:58931c2b6b0c
lock: fix encoding error when Mercurial emits a localized warning with the Kallithea "repository locked" message
Mercurial use (utf8) encoded localized messages. Things failed when it tried to
convert the encoded Mercurial format string to unicode so it could insert
Kallithea's unicode (but ascii compatible) "repository locked" exception
string.
That could for example be reproduced by running the (manual) vcs test
test_push_on_locked_repo_by_other_user_hg with environment LANG=de_DE for the
server side.
To fix this, make sure the "repository locked" message is encoded so Mercurial
handles it correctly.
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Wed, 15 Jun 2016 18:33:27 +0200 |
| parents | 29b69b044494 |
| children | 4e40640c43e5 |
| files | kallithea/lib/exceptions.py |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/exceptions.py Wed May 03 04:17:27 2017 +0200 +++ b/kallithea/lib/exceptions.py Wed Jun 15 18:33:27 2016 +0200 @@ -27,6 +27,8 @@ from webob.exc import HTTPClientError +from kallithea.lib.utils2 import safe_str + class LdapUsernameError(Exception): pass @@ -86,8 +88,8 @@ from kallithea.lib.utils2 import safe_int _code = CONFIG.get('lock_ret_code') self.code = safe_int(_code, self.code) - self.title = self.explanation = ('Repository `%s` locked by ' - 'user `%s`' % (reponame, username)) + self.title = self.explanation = safe_str( + 'Repository `%s` locked by user `%s`' % (reponame, username)) super(HTTPLockedRC, self).__init__(*args, **kwargs)