# HG changeset patch # User Travis Burtrum # Date 1405365143 -7200 # Node ID 074f9dd327364bc4781b042063bc1dfc8dca541b # Parent 493ccf3e22e6aec70fee498b8e7034f3e65fefb6 Fix built-in python hook names read from database in brand compatibility mode diff -r 493ccf3e22e6 -r 074f9dd32736 kallithea/lib/utils.py --- a/kallithea/lib/utils.py Mon Jul 14 21:12:23 2014 +0200 +++ b/kallithea/lib/utils.py Mon Jul 14 21:12:23 2014 +0200 @@ -44,6 +44,8 @@ from webhelpers.text import collapse, remove_formatting, strip_tags from beaker.cache import _cache_decorate +from kallithea import BRAND + from kallithea.lib.vcs import get_backend from kallithea.lib.vcs.backends.base import BaseChangeset from kallithea.lib.vcs.utils.lazy import LazyProperty @@ -382,10 +384,13 @@ hg_ui = ret for ui_ in hg_ui: if ui_.ui_active: + ui_val = safe_str(ui_.ui_value) + if ui_.ui_section == 'hooks' and BRAND != 'kallithea' and ui_val.startswith('python:' + BRAND + '.lib.hooks.'): + ui_val = ui_val.replace('python:' + BRAND + '.lib.hooks.', 'python:kallithea.lib.hooks.') log.debug('settings ui from db: [%s] %s=%s', ui_.ui_section, - ui_.ui_key, ui_.ui_value) + ui_.ui_key, ui_val) baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key), - safe_str(ui_.ui_value)) + ui_val) if ui_.ui_key == 'push_ssl': # force set push_ssl requirement to False, kallithea # handles that