From 9e17fd1f375be69bca7b4d09eb6fe151d073cc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 20 Aug 2024 15:02:30 +0200 Subject: [PATCH] Fixup last ipsilon commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bompard --- roles/ipsilon/tasks/main.yml | 10 +++++----- roles/ipsilon/tasks/patches.yml | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/roles/ipsilon/tasks/main.yml b/roles/ipsilon/tasks/main.yml index a89b551119..6be6fe19f7 100644 --- a/roles/ipsilon/tasks/main.yml +++ b/roles/ipsilon/tasks/main.yml @@ -84,16 +84,16 @@ tags: - ipsilon -- include_tasks: patches.yml - tags: - - ipsilon - - patches - - name: Destroy admin ticket command: kdestroy -A tags: - ipsilon +- import_tasks: patches.yml + tags: + - ipsilon + - patches + - name: make sure /etc/ipsilon/root is owned correctly file: path: "/etc/ipsilon/root" diff --git a/roles/ipsilon/tasks/patches.yml b/roles/ipsilon/tasks/patches.yml index 71391238a5..f3a6558e91 100644 --- a/roles/ipsilon/tasks/patches.yml +++ b/roles/ipsilon/tasks/patches.yml @@ -18,7 +18,13 @@ - name: apply patches ansible.builtin.shell: chdir: "{{ ansible_facts['python3']['sitelib'] }}" - cmd: filterdiff --include '?/ipsilon/' /opt/ipsilon-patches/{{item}}.patch | patch -p1 --forward --batch + cmd: filterdiff --include '?/ipsilon/*' /opt/ipsilon-patches/{{item}}.patch | patch -p1 --forward --fuzz=0 --reject-file=- --batch loop: "{{ ipsilon_patches }}" + register: result + ignore_errors: true + changed_when: + - "'Reversed (or previously applied) patch detected!' not in result.stdout" + - result.rc = 0 + failed_when: "'FAILED' in result.stdout" notify: - restart apache