From d0093cf9ccd86522a3baea4fd79c33e61d7f7b04 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 19 Jan 2024 12:59:14 +0100 Subject: [PATCH] Revert "riotctrl_ctrl: one more indirection to get native" This reverts commit 5e0c9b4bff88835190f6bb82f11e852fb8976e6e. --- dist/pythonlibs/riotctrl_ctrl/native.py | 5 ++--- dist/pythonlibs/riotctrl_ctrl/requirements.txt | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dist/pythonlibs/riotctrl_ctrl/native.py b/dist/pythonlibs/riotctrl_ctrl/native.py index 1695886a75..6e5bee1cd4 100644 --- a/dist/pythonlibs/riotctrl_ctrl/native.py +++ b/dist/pythonlibs/riotctrl_ctrl/native.py @@ -27,6 +27,5 @@ class NativeRIOTCtrl(riotctrl.ctrl.RIOTCtrl): def start_term(self, *args, **kwargs): super().start_term(*args, **kwargs) for child in psutil.Process(pid=self._term_pid()).children(): - for grandchild in child.children(): - if self._set_debug_adapter_id(grandchild): - break + if self._set_debug_adapter_id(child): + break diff --git a/dist/pythonlibs/riotctrl_ctrl/requirements.txt b/dist/pythonlibs/riotctrl_ctrl/requirements.txt index 98fb754d0f..a2b3329f10 100644 --- a/dist/pythonlibs/riotctrl_ctrl/requirements.txt +++ b/dist/pythonlibs/riotctrl_ctrl/requirements.txt @@ -1,3 +1,2 @@ psutil -pyserial riotctrl