diff mbox series

arm/fvp: Backport shlex.join from Python 3.8

Message ID 20221201124416.578360-1-peter.hoyes@arm.com
State New
Headers show
Series arm/fvp: Backport shlex.join from Python 3.8 | expand

Commit Message

Peter Hoyes Dec. 1, 2022, 12:44 p.m. UTC 
From: Peter Hoyes <Peter.Hoyes@arm.com>

721bec25 "arm/fvp: Join cli arguments in verbose logging" changed the
verbose output of FVPRunner to print the generated arguments using
shlex.join instead of as a list. However, this function is only
available in Python >= 3.8, whereas OE-core currently supports Python
3.6.

To fix this, backport its one-line implementation to a local function
shlex_join and update the call site.

Issue-Id: SCM-5314
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: I56cab9dddcd0a91272464be15742a6ee726dad41
---
 meta-arm/lib/fvp/runner.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Jon Mason Dec. 1, 2022, 4:03 p.m. UTC | #1 
On Thu, 1 Dec 2022 12:44:16 +0000, Peter Hoyes wrote:
> 721bec25 "arm/fvp: Join cli arguments in verbose logging" changed the
> verbose output of FVPRunner to print the generated arguments using
> shlex.join instead of as a list. However, this function is only
> available in Python >= 3.8, whereas OE-core currently supports Python
> 3.6.
> 
> To fix this, backport its one-line implementation to a local function
> shlex_join and update the call site.

Applied, thanks!

[1/1] arm/fvp: Backport shlex.join from Python 3.8
      commit: 02b430d045b50d5e5cab9a52b786d1134ba17c19

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/lib/fvp/runner.py b/meta-arm/lib/fvp/runner.py
index f55c579d..4fd624ba 100644
--- a/meta-arm/lib/fvp/runner.py
+++ b/meta-arm/lib/fvp/runner.py
@@ -70,6 +70,13 @@  class ConsolePortParser:
                 pass
 
 
+# This function is backported from Python 3.8. Remove it and replace call sites
+# with shlex.join once OE-core support for earlier Python versions is dropped.
+def shlex_join(split_command):
+    """Return a shell-escaped string from *split_command*."""
+    return ' '.join(shlex.quote(arg) for arg in split_command)
+
+
 class FVPRunner:
     def __init__(self, logger):
         self._logger = logger
@@ -88,7 +95,7 @@  class FVPRunner:
             if name in os.environ:
                 env[name] = os.environ[name]
 
-        self._logger.debug(f"Constructed FVP call: {shlex.join(cli)}")
+        self._logger.debug(f"Constructed FVP call: {shlex_join(cli)}")
         self._fvp_process = subprocess.Popen(
             cli,
             stdin=subprocess.DEVNULL, stdout=stdout, stderr=subprocess.STDOUT,