[checkmk-commits] Check_MK Git: check_mk: #2603 FIX Git integration: Preventing issues with *.mk.new files

Module: check_mk Branch: master Commit: cecfae34c2bafbbe53217c66253bffac4bf174e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cecfae34c2bafb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 10 11:41:23 2015 +0200 #2603 FIX Git integration: Preventing issues with *.mk.new files Ignoring *.mk.new files in git. These are temporary files which are being created during saving of changed configs files like the users.mk.new. --- .werks/2603 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2603 b/.werks/2603 new file mode 100644 index 0000000..1479f97 --- /dev/null +++ b/.werks/2603 @@ -0,0 +1,10 @@ +Title: Git integration: Preventing issues with *.mk.new files +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1441878037 +Class: fix + +Ignoring *.mk.new files in git. These are temporary files which are being created +during saving of changed configs files like the users.mk.new. diff --git a/ChangeLog b/ChangeLog index 61ba267..c30f93e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -245,6 +245,7 @@ * 2550 FIX: Catching exception when having name conflicts while moving a folder * 2552 FIX: API: Service Discovery action is now creating missing pending log entry and marks the site dirty * 2560 FIX: Fixed rare exception when using bulk host move... + * 2603 FIX: Git integration: Preventing issues with *.mk.new files... Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 82ada36..f83dfb6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -399,7 +399,7 @@ def do_git_commit(): git_command(["config", "user.name", "check_mk"]) # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\n") + file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\n*.mk.new\n") for subdir in os.listdir(defaults.default_config_dir): if subdir.endswith(".d"): file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n")