From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 14 Mar 2023 07:26:24 +0000 (+0000)
Subject: scripts/combo-layer: Fix python deprecation warning
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1392
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b1c1dd9985a6f1645271a928dda7f1897a7ba8a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

scripts/combo-layer: Fix python deprecation warning

Address:
DeprecationWarning: 'pipes' is deprecated and slated for removal in Python 3.13

pipes.quote is an alias for shlex.quote so switch to that.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 7f2020fca71..2312cef9ac1 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -19,7 +19,7 @@ import tempfile
 import configparser
 import re
 import copy
-import pipes
+import shlex
 import shutil
 from string import Template
 from functools import reduce
@@ -1275,7 +1275,7 @@ def apply_commit(parent, rev, largs, wargs, dest_dir, file_filter=None):
         target = os.path.join(wargs["destdir"], dest_dir)
         if not os.path.isdir(target):
             os.makedirs(target)
-        quoted_target = pipes.quote(target)
+        quoted_target = shlex.quote(target)
         # os.sysconf('SC_ARG_MAX') is lying: running a command with
         # string length 629343 already failed with "Argument list too
         # long" although SC_ARG_MAX = 2097152. "man execve" explains
@@ -1287,7 +1287,7 @@ def apply_commit(parent, rev, largs, wargs, dest_dir, file_filter=None):
             unquoted_args = []
             cmdsize = 100 + len(quoted_target)
             while update:
-                quoted_next = pipes.quote(update[0])
+                quoted_next = shlex.quote(update[0])
                 size_next = len(quoted_next) + len(dest_dir) + 1
                 logger.debug('cmdline length %d + %d < %d?' % (cmdsize, size_next, os.sysconf('SC_ARG_MAX')))
                 if cmdsize + size_next < max_cmdsize: