[checkmk-commits] Check_MK Git: check_mk: Minor code cleanup

Module: check_mk Branch: master Commit: 4406f8e83d1d8bdf14562b71282b4422d5299b46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4406f8e83d1d8b… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Sep 26 17:36:24 2013 +0200 Minor code cleanup --- modules/automation.py | 1 + modules/check_mk.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 00c6674..b5fd676 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -216,6 +216,7 @@ def automation_try_inventory_node(hostname): snmp_error = str(e) tcp_error = None + # Honor piggy_back data, even if host is not declared as TCP host if is_tcp_host(hostname) or \ get_piggyback_info(hostname) or get_piggyback_info(ipaddress): diff --git a/modules/check_mk.py b/modules/check_mk.py index f518e88..a1bc479 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2707,7 +2707,6 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals except KeyboardInterrupt: sys.stderr.write('<Interrupted>\n') - if not check_only: if newchecks != []: filename = autochecksdir + "/" + checkname + "-" + time.strftime("%Y-%m-%d_%H.%M.%S")