(airflow) branch v3-2-test updated: [v3-2-test] fix: restore early return in check_for_write_conflict (#64062) (#64426)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rahulvats pushed a commit to branch v3-2-test
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/v3-2-test by this push:
     new 68d98747872 [v3-2-test] fix: restore early return in check_for_write_conflict (#64062) (#64426)
68d98747872 is described below

commit 68d98747872d999929c2bff5f4df97489d921405
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Thu Apr 2 17:53:47 2026 +0530

    [v3-2-test] fix: restore early return in check_for_write_conflict (#64062) (#64426)
    
    (cherry picked from commit c2b72cfba5ff01bb7e823827a36e4e797ec668ec)
    
    Co-authored-by: Kundan <ku...@gmail.com>
    Co-authored-by: Rahul Vats <43...@users.noreply.github.com>
---
 airflow-core/src/airflow/models/variable.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airflow-core/src/airflow/models/variable.py b/airflow-core/src/airflow/models/variable.py
index 5435326de54..48fa0148792 100644
--- a/airflow-core/src/airflow/models/variable.py
+++ b/airflow-core/src/airflow/models/variable.py
@@ -480,14 +480,14 @@ class Variable(Base, LoggingMixin):
                             _backend_name,
                             _backend_name,
                         )
-                        return
+                        return None
                 except Exception:
                     log.exception(
                         "Unable to retrieve variable from secrets backend (%s). "
                         "Checking subsequent secrets backend.",
                         type(secrets_backend).__name__,
                     )
-            return None
+        return None
 
     @staticmethod
     def get_variable_from_secrets(key: str, team_name: str | None = None) -> str | None: