Merge pull request sap-linuxlab#860 from berndfinger/issue-859-regres…

…sion-in-856 sap_install_media_detect: Fix issue sap-linuxlab#859
berndfinger · Sep 5, 2024 · 353abe1 · 353abe1
2 parents 2461cc5 + 2a2e185
commit 353abe1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml b/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml
@@ -27,7 +27,7 @@
 
 - name: SAP Install Media Detect - Prepare - Iterate over files and determine file type, including command for handling RAR files
   ansible.builtin.command: "{{ __sap_install_media_detect_sapfile_path }} -e --lsar_file={{ __sap_install_media_detect_rar_list.split(' ')[0] }} --sapcar_file={{ __sap_install_media_detect_fact_sapcar_path }} {{ line_item }}"
-  register: __sap_install_media_detect_register_files_phase_2
+  register: __sap_install_media_detect_register_files_phase_2_rar
   loop: "{{ __sap_install_media_detect_fact_find_result_phase_2 }}"
   loop_control:
     loop_var: line_item
@@ -36,13 +36,19 @@
 
 - name: SAP Install Media Detect - Prepare - Iterate over files and determine file type, without command for handling RAR files
   ansible.builtin.command: "{{ __sap_install_media_detect_sapfile_path }} -e --sapcar_file={{ __sap_install_media_detect_fact_sapcar_path }} {{ line_item }}"
-  register: __sap_install_media_detect_register_files_phase_2
+  register: __sap_install_media_detect_register_files_phase_2_norar
   loop: "{{ __sap_install_media_detect_fact_find_result_phase_2 }}"
   loop_control:
     loop_var: line_item
   changed_when: false
   when: not sap_install_media_detect_rar_handling
 
+- name: SAP Install Media Detect - Prepare - Set fact from determining the file type
+  ansible.builtin.set_fact:
+    __sap_install_media_detect_register_files_phase_2: "{{ __sap_install_media_detect_register_files_phase_2_rar
+      if sap_install_media_detect_rar_handling
+      else __sap_install_media_detect_register_files_phase_2_norar }}"
+
 - name: SAP Install Media Detect - Prepare - Set fact with the results of the sapfile command
   ansible.builtin.set_fact:
     __sap_install_media_detect_fact_files_sapfile_results: "{{ __sap_install_media_detect_fact_files_sapfile_results + [__new_dict] }}"