Module: check_mk
Branch: master
Commit: 611d7d791111e767ab611bd723f37c235d7bec68
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=611d7d791111e7…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 12 11:49:30 2016 +0100
wato gitignore minor readability formating
---
ChangeLog | 1 +
web/htdocs/watolib.py | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index aa5b267..3b60cf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
1.2.9i1:
+
1.2.8b1:
Core & Setup:
* 2771 Errors in Check_MK configuration do not prevent the core from being restarted
anymore...
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index 75e915d..453f743 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -4247,10 +4247,18 @@ 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*.mk.new\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")
+ file(defaults.default_config_dir + "/" + subdir +
"/.gitignore", "w").write(
+ "*\n"
+ "!wato\n"
+ "!wato/*\n")
git_command(["add", ".gitignore", "*.d/wato"])
git_command(["commit", "--untracked-files=no",
"--author", author, "-m", shell_quote(_("Initialized GIT for
Check_MK"))])