Module: check_mk Branch: master Commit: c48868d74aff52806d330cdc719a8d038222131e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c48868d74aff52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 13:30:43 2017 +0100 4322 FIX Activate changes: Fixed exception when having EC changes and core changes while core produces a warning Change-Id: I08c730fdc683e28ce6a15bec8f878fb19bd79b2d --- .werks/4322 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4322 b/.werks/4322 new file mode 100644 index 0000000..f4c107d --- /dev/null +++ b/.werks/4322 @@ -0,0 +1,9 @@ +Title: Activate changes: Fixed exception when having EC changes and core changes while core produces a warning +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1486384214 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f4aec0e..387c119 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ NOTE: Please refer to the migration notes! * 4312 FIX: Counting events are now also respecting the EC limits * 4314 FIX: Quick event delete icon works with checkboxes enabled now + * 4322 FIX: Activate changes: Fixed exception when having EC changes and core changes while core produces a warning HW/SW-Inventory: * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index e483708..ff53d57 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4731,7 +4731,8 @@ def execute_activate_changes(domains): results = {} for domain in domains: domain_class = ConfigDomain.get_class(domain) - results[domain] = domain_class().activate() + warnings = domain_class().activate() + results[domain] = warnings or [] return results