Module: check_mk
Branch: master
Commit: dd9d0820401bc95f0deb74ecbbcc6630452689a7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd9d0820401bc9…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Mar 13 18:14:09 2018 +0100
Removed unconfigurable static flag inventory_pprint_output
Change-Id: I1ba1954766963a2112f622e531d1baf07ce66287
---
cmk_base/inventory.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py
index 4b6e564..1126979 100644
--- a/cmk_base/inventory.py
+++ b/cmk_base/inventory.py
@@ -57,8 +57,6 @@ import cmk_base.data_sources as data_sources
inventory_output_dir = cmk.paths.var_dir + "/inventory"
inventory_archive_dir = cmk.paths.var_dir + "/inventory_archive"
status_data_dir = cmk.paths.tmp_dir + "/status_data"
-# TODO: This is not configurable. Drop the flag?
-inventory_pprint_output = False
#.
# .--Inventory-----------------------------------------------------------.
@@ -320,7 +318,7 @@ def _save_inventory_tree(hostname, inventory_tree):
if not os.path.exists(arcdir):
os.makedirs(arcdir)
os.rename(filepath, arcdir + ("/%d" % old_time))
- inventory_tree.save_to(inventory_output_dir, hostname,
pretty=inventory_pprint_output)
+ inventory_tree.save_to(inventory_output_dir, hostname)
else:
if os.path.exists(filepath): # Remove empty inventory files. Important for host
inventory icon
@@ -337,7 +335,7 @@ def _save_status_data_tree(hostname, status_data_tree):
filepath = "%s/%s" % (status_data_dir, hostname)
if status_data_tree and not status_data_tree.is_empty():
- status_data_tree.save_to(status_data_dir, hostname,
pretty=inventory_pprint_output)
+ status_data_tree.save_to(status_data_dir, hostname)
else:
if os.path.exists(filepath): # Remove empty status data files.