From 8d62bfa79a3dcdfd199a5891e77d55517861a18a Mon Sep 17 00:00:00 2001 From: fravetier Date: Fri, 7 Nov 2025 11:08:16 +0100 Subject: [PATCH] Migrate ansible 11 -> 12 : bug corrected --- tasks/update-code/git.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tasks/update-code/git.yml b/tasks/update-code/git.yml index 2669ded..369a6e7 100644 --- a/tasks/update-code/git.yml +++ b/tasks/update-code/git.yml @@ -4,7 +4,7 @@ src: "{{ ansistrano_git_identity_key_path }}" dest: "{{ ansistrano_deploy_to }}/git_identity_key" mode: 0400 - when: ansistrano_git_identity_key_path is defined and ansistrano_git_identity_key_path | trim | length > 0 + when: ansistrano_git_identity_key_path is defined and ansistrano_git_identity_key_path|trim|length > 0 - name: ANSISTRANO | GIT | Ensure GIT deployment key is up to date (remote key file) copy: @@ -27,7 +27,7 @@ depth: "{{ ansistrano_git_depth | default(omit) }}" executable: "{{ ansistrano_git_executable | default(omit) }}" register: ansistrano_git_result_update - when: ansistrano_git_identity_key_path | default('') | trim | length == 0 and ansistrano_git_identity_key_remote_path | default('') | trim | length == 0 + when: (ansistrano_git_identity_key_path | default('') | trim) == '' and (ansistrano_git_identity_key_remote_path | default('') | trim) == '' - name: ANSISTRANO | GIT | Update remote repository using SSH key git: @@ -43,18 +43,14 @@ key_file: "{{ ansistrano_deploy_to }}/git_identity_key" executable: "{{ ansistrano_git_executable | default(omit) }}" register: ansistrano_git_result_update_ssh - when: ansistrano_git_identity_key_path | default('') | trim | length > 0 or ansistrano_git_identity_key_remote_path | default('') | trim | length > 0 + when: ansistrano_git_identity_key_path is defined and ansistrano_git_identity_key_path|trim|length > 0 or ansistrano_git_identity_key_remote_path is defined and ansistrano_git_identity_key_remote_path|trim|length > 0 - name: ANSISTRANO | GIT | Register ansistrano_git_result variable - set_fact: - ansistrano_git_result: "{{ ansistrano_git_result_update_ssh if ansistrano_git_result_update is skipped else ansistrano_git_result_update }}" + set_fact: ansistrano_git_result={{ ansistrano_git_result_update_ssh if ansistrano_git_result_update is skipped else ansistrano_git_result_update }} - name: ANSISTRANO | GIT | Shred GIT deployment key command: shred -f "{{ ansistrano_deploy_to }}/git_identity_key" - when: - - (ansistrano_git_identity_key_path | default('') | trim | length > 0) or - (ansistrano_git_identity_key_remote_path | default('') | trim | length > 0) - - ansistrano_git_identity_key_shred | default(false) | bool + when: (ansistrano_git_identity_key_path is defined and ansistrano_git_identity_key_path|trim|length > 0 or ansistrano_git_identity_key_remote_path is defined and ansistrano_git_identity_key_remote_path|trim|length > 0) and ansistrano_git_identity_key_shred is defined and ansistrano_git_identity_key_shred|bool == true - name: ANSISTRANO | GIT | Set git_real_repo_tree set_fact: