From 905b31acaa286c18b8914bdd3f06fd2d00932230 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 8 Oct 2020 22:44:54 +0200
Subject: no more flush-handlers for apt-repos

---
 roles/apt-repo/blackmagic/tasks/main.yml | 44 ++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 19 deletions(-)

(limited to 'roles/apt-repo/blackmagic/tasks')

diff --git a/roles/apt-repo/blackmagic/tasks/main.yml b/roles/apt-repo/blackmagic/tasks/main.yml
index 3152d7b8..c2652ed3 100644
--- a/roles/apt-repo/blackmagic/tasks/main.yml
+++ b/roles/apt-repo/blackmagic/tasks/main.yml
@@ -3,7 +3,7 @@
   copy:
     src: repo.gpg
     dest: /etc/apt/trusted.gpg.d/blackmagic.gpg
-  notify: update apt cache
+  register: apt_repo_blackmagic_key
 
 
 - name: configure repo authentication
@@ -16,28 +16,28 @@
     line: "machine build.spreadspace.org login {{ apt_repo_blackmagic_auth.username }} password {{ apt_repo_blackmagic_auth.password }}"
     create: yes
     mode: 0600
-  notify: update apt cache
+  register: apt_repo_blackmagic_auth_legacy
 
 - name: configure repo authentication
   when: (ansible_distribution == "Ubuntu") or
         (ansible_distribution == "Debian" and (ansible_distribution_major_version | int) >= 10)
   block:
-    - name: remove old repo authentication
-      lineinfile:
-        path: /etc/apt/auth.conf
-        regexp: "^machine build.spreadspace.org "
-        state: absent
-      notify: update apt cache
+  - name: remove old repo authentication
+    lineinfile:
+      path: /etc/apt/auth.conf
+      regexp: "^machine build.spreadspace.org "
+      state: absent
+    register: apt_repo_blackmagic_auth_legacy_remove
 
-    - name: configure repo authentication
-      copy:
-        content: |
-          machine build.spreadspace.org
-          login {{ apt_repo_blackmagic_auth.username }}
-          password {{ apt_repo_blackmagic_auth.password }}
-        dest: /etc/apt/auth.conf.d/blackmagic.conf
-        mode: 0600
-      notify: update apt cache
+  - name: configure repo authentication
+    copy:
+      content: |
+        machine build.spreadspace.org
+        login {{ apt_repo_blackmagic_auth.username }}
+        password {{ apt_repo_blackmagic_auth.password }}
+      dest: /etc/apt/auth.conf.d/blackmagic.conf
+      mode: 0600
+    register: apt_repo_blackmagic_auth
 
 
 - name: add repository entry
@@ -45,7 +45,13 @@
     content: |
       deb https://build.spreadspace.org/ {{ ansible_distribution_release }} blackmagic
     dest: /etc/apt/sources.list.d/blackmagic.list
-  notify: update apt cache
+  register: apt_repo_blackmagic_sources
 
 - name: update apt cache
-  meta: flush_handlers
+  when: apt_repo_blackmagic_key is changed or
+        apt_repo_blackmagic_auth_legacy is changed or
+        apt_repo_blackmagic_auth_legacy_remove is changed or
+        apt_repo_blackmagic_auth is changed or
+        apt_repo_blackmagic_sources is changed
+  apt:
+    update_cache: yes
-- 
cgit v1.2.3