[checkmk-commits] Check_MK Git: check_mk: --debug now automatically implies -v

Module: check_mk Branch: master Commit: e162b9fab2391b3d849de259150d4ad4cd50b375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e162b9fab2391b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 16:44:28 2011 +0200 --debug now automatically implies -v --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 122baf9..5f092ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Call snmp(bulk)walk always with the option -Cc (fixes problems in some cases where OIDs are missing) * Allow merging of dictionary based check parameters + * --debug now implies -v Multisite: * FIX: Nagios-Snapin: avoid duplicate slash in URL diff --git a/modules/check_mk.py b/modules/check_mk.py index c057f92..ab9c142 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -35,8 +35,8 @@ check_mk_version = '(inofficial)' # Some things have to be done before option parsing and might # want to output some verbose messages. if __name__ == "__main__": - opt_verbose = '-v' in sys.argv[1:] or '--verbose' in sys.argv[1:] opt_debug = '--debug' in sys.argv[1:] + opt_verbose = opt_debug or '-v' in sys.argv[1:] or '--verbose' in sys.argv[1:] else: opt_verbose = False opt_debug = False