MIRRORS/poky-config
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky-config.git synced 2025-12-14 14:25:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

combo-layer: Fix pipes/shlex issues

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2023-04-13 17:36:18 +01:00
parent a56617f68a
commit 22f5cb461b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
combo-layer
View File

@ -19,7 +19,7 @@ import tempfile
import configparser
import re
import copy
import pipes
import shlex
import shutil
from collections import OrderedDict
from string import Template
@ -1259,7 +1259,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
@ -1271,7 +1271,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: