From bdd83120b725d3f2bf3f2284cd2c8e04d84f9877 Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Mon, 24 Nov 2025 13:50:34 +0100
Subject: [PATCH] fix(task): ensure migration script continues on update-module
 failure

- Modify `migrate` function to prevent exit on `update-module` command failure
- Adjust `remove-ssh-key` script to improve SSH agent detection and cleanup
- Maintain compatibility with existing SSH key handling behavior
---
 images/odoo/bin/remove-ssh-key | 5 ++---
 task                           | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/images/odoo/bin/remove-ssh-key b/images/odoo/bin/remove-ssh-key
index c4d3cd5d..63aff554 100755
--- a/images/odoo/bin/remove-ssh-key
+++ b/images/odoo/bin/remove-ssh-key
@@ -3,12 +3,11 @@ set -e
 
 if [[ -n "$GIT_SSH_PRIVATE_KEY" ]]; then
     key_filename="${SSH_ID_ALGORITHM:=id_ed25519}"
-
     log-entrypoint 'Remove SSH key from env var.'
-    if grep -u "$(id -u)" ssh-agent > /dev/null; then
+    if [[ -n "$SSH_AUTH_SOCK" ]] || [[ -n "$SSH_AGENT_PID" ]]; then
         if [[ -f "$HOME/.ssh/$key_filename" ]]; then
             ssh-add -d "$HOME/.ssh/$key_filename" 2>/dev/null || true
         fi
     fi
     rm -f "$HOME/.ssh/$key_filename"
-fi
+fi
\ No newline at end of file
diff --git a/task b/task
index e882f989..bef18d89 100755
--- a/task
+++ b/task
@@ -1544,7 +1544,7 @@ def migrate(cr, version):
     _logger.info("Updated %s partners", len(partners))
 EOF
         sed -i "/\"version\":/c\    \"version\": \"${ODOO_VERSION}.2.0.0\"," oca/partner-contact/partner_firstname/__manifest__.py
-        exec odoo update-module partner_firstname 2>&1 | grep "module partner_firstname: Running migration"
+        odoo update-module partner_firstname 2>&1 | grep "module partner_firstname: Running migration" || true
     fi
 }