[checkmk-commits] Cleaned up references to old defaults file

Module: check_mk Branch: master Commit: cf99e99c1b87477251cc7fa08ccdee2b4f7127df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf99e99c1b8747… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 22 08:08:54 2016 +0200 Cleaned up references to old defaults file --- modules/localize.py | 8 ++++---- tests/testlib/pylint_cmk.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/localize.py b/modules/localize.py index 4ae3f1c..690fa9e 100644 --- a/modules/localize.py +++ b/modules/localize.py @@ -246,8 +246,8 @@ def localize_update(lang): # Maybe initialize the file in the local hierarchy with the file in # the default hierarchy if not os.path.exists(po_file) \ - and os.path.exists(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)): - file(po_file, 'w').write(file(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)).read()) + and os.path.exists(cmk.paths.locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)): + file(po_file, 'w').write(file(cmk.paths.locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)).read()) sys.stdout.write('Initialize %s with the file in the default hierarchy\n' % po_file) localize_sniff() @@ -271,8 +271,8 @@ def localize_compile(lang): # Maybe initialize the file in the local hierarchy with the file in # the default hierarchy if not os.path.exists(po_file) \ - and os.path.exists(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)): - file(po_file, 'w').write(file(locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)).read()) + and os.path.exists(cmk.paths.locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)): + file(po_file, 'w').write(file(cmk.paths.locale_dir + '/%s/LC_MESSAGES/%s.po' % (lang, domain)).read()) sys.stdout.write('Initialize %s with the file in the default hierarchy\n' % po_file) if not os.path.exists(po_file): diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 40e55c2..e9795ea 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -16,7 +16,6 @@ from testlib import repo_path def ordered_module_files(): ordered_modules = [ - "defaults", "modules/check_mk_base.py", "modules/check_mk.py", "modules/config.py",