[checkmk-commits] Check_MK Git: check_mk: #1211 FIX Fixed g_git_messages error on activate changes

Module: check_mk Branch: master Commit: b0b3f5e4217ad4f9cc737174d980c56c5e647ab9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0b3f5e4217ad4… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Tue Jan 13 13:07:10 2015 +0100 #1211 FIX Fixed g_git_messages error on activate changes Randomly there was a error message while activate changes g_git_messages, referenced before assignment. This should be fixed now. --- .werks/1211 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 +++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/1211 b/.werks/1211 new file mode 100644 index 0000000..fb476d6 --- /dev/null +++ b/.werks/1211 @@ -0,0 +1,12 @@ +Title: Fixed g_git_messages error on activate changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421150687 + +Randomly there was a error message while activate changes g_git_messages, referenced before assignment. This +should be fixed now. + diff --git a/ChangeLog b/ChangeLog index ad00190..f9d3804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 1790 FIX: Fix WATO parameters page for passive checks... * 1794 FIX: Fix exception in WATO service list in case of vanished checks * 1805 FIX: Changing roles marks sites where users can login dirty for sync now... + * 1211 FIX: Fixed g_git_messages error on activate changes... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 00fefa3..362ce2e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -173,8 +173,6 @@ wato_styles = [ "pages", "wato", "status" ] def page_handler(): global g_html_head_open g_html_head_open = False - global g_git_messages - g_git_messages = [] if not config.wato_enabled: raise MKGeneralException(_("WATO is disabled. Please set <tt>wato_enabled = True</tt>" @@ -11232,9 +11230,6 @@ def page_automation(): if secret != get_login_secret(): raise MKAuthException(_("Invalid automation secret.")) - global g_git_messages - g_git_messages = [] - # To prevent mixups in written files we use the same lock here as for # the normal WATO page processing. This might not be needed for some # special automation requests, like inventory e.g., but to keep it simple, @@ -18457,6 +18452,9 @@ modes = { loaded_with_language = False def load_plugins(): + global g_git_messages + g_git_messages = [] + global loaded_with_language if loaded_with_language == current_language: return