[checkmk-commits] Fix GIT function in WATO after WATO restructuration

Module: check_mk Branch: master Commit: 09280abee46cc5912f9bfa4a074298e61e89aa79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09280abee46cc5… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Feb 10 11:22:08 2016 +0100 Fix GIT function in WATO after WATO restructuration --- web/htdocs/wato.py | 6 +++--- web/htdocs/watolib.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 627b8d6..305012f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -148,6 +148,9 @@ def page_handler(): if html.is_transaction(): lock_exclusive() + if config.wato_use_git: + prepare_git_commit() + try: init_wato_datastructures() except: @@ -15897,9 +15900,6 @@ modes = { loaded_with_language = False def load_plugins(force): - global g_git_messages - g_git_messages = [] - global loaded_with_language if loaded_with_language == current_language and not force: return diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index cca476c..aee3308 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4249,6 +4249,11 @@ def shell_quote(s): return "'" + s.replace("'", "'\"'\"'") + "'" +def prepare_git_commit(): + global g_git_messages + g_git_messages = [] + + def do_git_commit(): author = shell_quote("%s <%s>" % (config.user_id, config.user_email)) git_dir = defaults.default_config_dir + "/.git"