Module: check_mk Branch: master Commit: b4d28110126ca7387d3d37995080e35b41a2c50d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4d28110126ca7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 11:47:36 2014 +0200 #0191 FIX Added swp files to the ignore list for the WATO git feature Wato does not longer try to add swap files created by vim when editing the config manual and activate changes in the same time. --- .werks/191 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/191 b/.werks/191 new file mode 100644 index 0000000..d753a3b --- /dev/null +++ b/.werks/191 @@ -0,0 +1,10 @@ +Title: Added swp files to the ignore list for the WATO git feature +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406799966 + +Wato does not longer try to add swap files created by vim when editing the config manual and activate +changes in the same time. diff --git a/ChangeLog b/ChangeLog index fa57ac7..2e47ca7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 1089 FIX: Snapshot restore: fixed exception during exception handling...... * 1091 FIX: logwatch patterns: allow unicode text in pattern comment * 1092 FIX: logwatch: now able to enter unicode text into the "Pattern (Regex)" field + * 0191 FIX: Added swp files to the ignore list for the WATO git feature... 1.2.5i5: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 451cc8d..e5d086c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -380,7 +380,7 @@ def do_git_commit(): git_command(["init"]) # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n") + file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\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")