From e7952dc3c861892bdbb5d735d7420add6b9cec5a Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 8 Jan 2020 17:19:36 +0100 Subject: [PATCH] etc-git: fix warnings ansible-lint --- CHANGELOG.md | 1 + etc-git/tasks/commit.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb90f9c3..220e4c5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,7 @@ The **patch** part changes incrementally at each release. * varnish: remove custom ExecReload= script for Debian 10+ ### Fixed +* etc-git: fix warnings ansible-lint * evoadmin-web: Put the php config at the right place for Buster * lxc-php: Don't remove the default pool * minifirewall: fix warnings ansible-lint diff --git a/etc-git/tasks/commit.yml b/etc-git/tasks/commit.yml index 85c36641..58aee384 100644 --- a/etc-git/tasks/commit.yml +++ b/etc-git/tasks/commit.yml @@ -31,7 +31,7 @@ - name: "set commit author" set_fact: commit_author: '{% if ansible_env.SUDO_USER is not defined %}root{% else %}{{ ansible_env.SUDO_USER }}{% endif %}' - commit_email: '{% if git_config_user_email.config_value is not defined or git_config_user_email.config_value == "" %}root@localhost{% else %}{{ git_config_user_email.config_value }}{% endif %}' + commit_email: '{% if git_config_user_email.config_value is not defined or not git_config_user_email.config_value %}root@localhost{% else %}{{ git_config_user_email.config_value }}{% endif %}' # noqa 204 tags: - etc-git - commit-etc @@ -41,7 +41,9 @@ args: chdir: /etc register: etc_commit_end_run - when: not ansible_check_mode and git_status.stdout != "" + when: + - not ansible_check_mode + - git_status.stdout ignore_errors: yes tags: - etc-git