Module: check_mk
Branch: master
Commit: 2d62f167a846cedd2f438acca071145f8e6e2cda
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d62f167a846ce…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 21 15:19:43 2016 +0100
3336 FIX Fixed possible crash on werk list page
SyntaxError (unexpected EOF while parsing (unknown, line 0))
---
.werks/3336 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/werks.py | 8 +++++---
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/.werks/3336 b/.werks/3336
new file mode 100644
index 0000000..46198b7
--- /dev/null
+++ b/.werks/3336
@@ -0,0 +1,10 @@
+Title: Fixed possible crash on werk list page
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1458569944
+
+SyntaxError (unexpected EOF while parsing (unknown, line 0))
diff --git a/ChangeLog b/ChangeLog
index 33aff24..188325f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -125,6 +125,7 @@
* 3294 FIX: Fixed mixed languages when some users have localized GUI and some not...
* 3313 FIX: Set correct mime type when exporting CSV and other non-HTML formats
* 3315 FIX: Builtin icon visibility now can be correctly reset...
+ * 3336 FIX: Fixed possible crash on werk list page...
WATO:
* 3244 WATO BI Module: swap order of aggregation function and child node
selection...
diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py
index f203530..8363ace 100644
--- a/web/htdocs/werks.py
+++ b/web/htdocs/werks.py
@@ -230,9 +230,11 @@ def load_werk(path):
def load_acknowledgements():
if os.path.exists(acknowledgement_path):
- return literal_eval(file(acknowledgement_path).read())
- else:
- return []
+ content = file(acknowledgement_path).read().strip()
+ if content:
+ return literal_eval(file(acknowledgement_path).read())
+
+ return []
def unacknowledged_incompatible_werks():