[checkmk-commits] Check_MK Git: check_mk: FIX: local checks could not override shipped ones

Module: check_mk Branch: master Commit: 8b2121b0db14a783cfdfa5e3149cad27174dd4e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b2121b0db14a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 8 20:48:51 2011 +0200 FIX: local checks could not override shipped ones --- modules/check_mk.py | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 906afd6..d59e5a7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -368,12 +368,19 @@ def no_inventory_possible(checkname, info): if __name__ == "__main__": filelist = glob.glob(checks_dir + "/*") - if local_checks_dir: - filelist += glob.glob(local_checks_dir + "/*") filelist.sort() - # read include files first! + + # read local checks *after* shipped ones! + if local_checks_dir: + local_files = glob.glob(local_checks_dir + "/*") + local_files.sort() + filelist += local_files + + # read include files always first, but still in the sorted + # order with local ones last (possibly overriding variables) filelist = [ f for f in filelist if f.endswith(".include") ] + \ [ f for f in filelist if not f.endswith(".include") ] + for f in filelist: if not f.endswith("~"): # ignore emacs-like backup files try: