[checkmk-commits] Fixed lib_dir location. Should be lib/ instead of lib/check_mk

Module: check_mk Branch: master Commit: 2719a0a9a16fdb808d9309dcbfb54319cf231352 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2719a0a9a16fdb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 26 14:44:01 2016 +0200 Fixed lib_dir location. Should be lib/ instead of lib/check_mk --- lib/paths.py | 2 +- modules/packaging.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/paths.py b/lib/paths.py index 5ddb2a1..82e2ae2 100644 --- a/lib/paths.py +++ b/lib/paths.py @@ -169,7 +169,7 @@ def _set_overridable_paths(local=False): var_prefix+"doc_dir" : os.path.join(omd_root, rel_base, "share/doc/check_mk"), var_prefix+"locale_dir" : os.path.join(omd_root, rel_base, "share/check_mk/locale"), var_prefix+"bin_dir" : os.path.join(omd_root, rel_base, "bin"), - var_prefix+"lib_dir" : os.path.join(omd_root, rel_base, "lib/check_mk"), + var_prefix+"lib_dir" : os.path.join(omd_root, rel_base, "lib"), }) diff --git a/modules/packaging.py b/modules/packaging.py index e0a2835..3b53289 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -57,8 +57,8 @@ package_parts = [ (part, title, perm, ldir and ldir or dir) for part, title, per ( "web", "Multisite extensions", 0644, cmk.paths.web_dir, cmk.paths.local_web_dir ), ( "pnp-templates", "PNP4Nagios templates", 0644, cmk.paths.pnp_templates_dir, cmk.paths.local_pnp_templates_dir ), ( "doc", "Documentation files", 0644, cmk.paths.doc_dir, cmk.paths.local_doc_dir ), - ( "bin", "Binaries", 0755, None, cmk.paths.local_bin_dir ), - ( "lib", "Libraries", 0644, None, cmk.paths.local_lib_dir), + ( "bin", "Binaries", 0755, None, cmk.paths.local_bin_dir ), + ( "lib", "Libraries", 0644, None, cmk.paths.local_lib_dir), ]] package_ignored_files = {