diff mbox series

[Concept,4/4] pickman: Handle connection errors gracefully in do_step()

Message ID 20260305145452.909661-5-sjg@u-boot.org
State New
Headers
Series pickman: Improve subtree-update and error handling |

Commit Message

Simon Glass March 5, 2026, 2:54 p.m. UTC 
  From: Simon Glass <sjg@chromium.org>

When the GitLab server drops the connection, do_step() crashes with an
unhandled requests.exceptions.ConnectionError. Catch this specific
exception in do_step(), report it, and return failure. This means
'poll' continues to the next iteration after the sleep, while 'step'
reports the error and aborts cleanly.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 tools/pickman/control.py | 11 +++++++++++
 1 file changed, 11 insertions(+)
diff mbox series

Patch

diff --git a/tools/pickman/control.py b/tools/pickman/control.py
index 6d787d02163..817ae02d900 100644
--- a/tools/pickman/control.py
+++ b/tools/pickman/control.py
@@ -15,6 +15,8 @@  import tempfile
 import time
 import unittest
 
+import requests
+
 # Allow 'from pickman import xxx' to work via symlink
 our_path = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, os.path.join(our_path, '..'))
@@ -2872,6 +2874,15 @@  def do_step(args, dbs):
     Returns:
         int: 0 on success, 1 on failure
     """
+    try:
+        return _do_step(args, dbs)
+    except requests.exceptions.ConnectionError as exc:
+        tout.error(f'step failed with connection error: {exc}')
+        return 1
+
+
+def _do_step(args, dbs):
+    """Internal implementation of do_step"""
     remote = args.remote
     source = args.source