From 7ac0bbbb5bf7f12f5b0169b6ca6534a4a6c03cf5 Mon Sep 17 00:00:00 2001
From: Murat Aybars <39916128+aybarsm@users.noreply.github.com>
Date: Wed, 3 Jul 2024 23:55:03 +0100
Subject: [PATCH] Prep - deb clean os upgrade

---
 .../tasks/deb_initial_upgrade.yml             | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/roles/package_manager/tasks/deb_initial_upgrade.yml b/roles/package_manager/tasks/deb_initial_upgrade.yml
index a88b036..f958da1 100644
--- a/roles/package_manager/tasks/deb_initial_upgrade.yml
+++ b/roles/package_manager/tasks/deb_initial_upgrade.yml
@@ -4,15 +4,17 @@
   ansible.builtin.tempfile:
     state: directory
     suffix: etc_apt
-  register: package_manager__create_temp_etc_apt_dir
+  register: package_manager__create_temp_repo_dir
 
-- name: Create sources.list.d directory in temporary etc_apt directory
+- name: Create repo list directory in temporary etc_apt directory
   become: true
   ansible.builtin.file:
     state: directory
     recurse: true
-    path: "{{ package_manager__create_temp_etc_apt_dir.path }}/sources.list.d"
-  register: package_manager__temp_etc_apt_sources_dir
+    path: "{{ package_manager__create_temp_etc_apt_dir.path '/' + repo_list_dir_basename }}"
+  register: package_manager__create_temp_etc_apt_sources_dir
+  vars:
+    repo_list_dir_basename: "{{ package_manager__repo_list_dir | basename }}"
   when: package_manager__create_temp_etc_apt_dir.path is defined
 
 - name: Check main sources.list file status
@@ -21,14 +23,6 @@
     path: "{{ package_manager__repo_list_file }}"
   register: package_manager__repo_list_file_stat
 
-- name: Remove temporary etc_apt directory
-  become: true
-  ansible.builtin.tempfile:
-    path: "{{ package_manager__create_temp_etc_apt_dir.path }}"
-    state: absent
-  register: package_manager__remove_temp_etc_apt_dir
-  when: package_manager__create_temp_etc_apt_dir.path is defined
-
 # - name: Debug find patterns
 #   ansible.builtin.debug:
 #     msg:
@@ -51,23 +45,20 @@
     patterns: [".*\\.list$"]
     use_regex: true
   register: package_manager__repo_list_find
-  vars:
-    base_sources: "^{{ package_manager__repo_list_file | basename }}$"
-    # base_sources_dir: "^{{ package_manager__repo_list_dir | basename }}\\/.*\\.list$"
-    # base_sources_dir: "{{ package_manager__repo_list_dir | basename }}\\/.*\\.list$"
-    # base_sources_dir: "{{ package_manager__repo_list_dir | basename | ansible.builtin.regex_escape }}\\/*"
-    base_sources_dir: ".*sources\\.list\\.d\\/.*\\.list$"  
-    # find_patterns: "{{ [base_sources, base_sources_dir] }}"
-    # find_patterns: "{{ [base_sources_dir] }}"
-    find_patterns:    
-      - "^sources\\.list$"
-      - "^sources\\.list\\.d\\/.*\\.list$"
 
 - name: Debug find apt source files
   ansible.builtin.debug:
     msg:
-      # stat_main: "{{ package_manager__repo_list_file_stat }}"
+      stat_main: "{{ package_manager__repo_list_file_stat }}"
       found: "{{ package_manager__repo_list_find }}"
+      main_source: "{{ main_source }}"
+      found_sources: "{{ found_sources }}"
+  vars:
+    main_source_check: "{{ package_manager__repo_list_file_stat.stat.path | default('') }}"
+    main_source: "{{ (not main_source_check) | ternary([], [main_source_check]) }}"
+    found_sources: "{{ package_manager__repo_list_find.files |
+      ternary(package_manager__repo_list_find.files | map(attribute='path') | list, []) }}"
+
 
 # - name: Find apt source files
 #   become: true
@@ -76,4 +67,12 @@
 #     patterns: "{{ systemd__network_cleanup_patterns }}"
 #     use_regex: "{{ systemd__network_cleanup_patterns_use_regex | bool }}"
 #   when: systemd__network_cleanup | bool
-#   register: systemd__network_find_cleanup_files
\ No newline at end of file
+#   register: systemd__network_find_cleanup_files
+
+- name: Remove temporary etc_apt directory
+  become: true
+  ansible.builtin.tempfile:
+    path: "{{ package_manager__create_temp_repo_dir.path }}"
+    state: absent
+  register: package_manager__remove_temp_etc_apt_dir
+  when: package_manager__create_temp_repo_dir.path is defined
\ No newline at end of file