commit: 158ff662921150011fdd9929e8e7d5f4be946a5d Author: Sheng Yu <syu.os <AT> protonmail <DOT> com> AuthorDate: Sun Jul 17 23:00:14 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 18 20:41:57 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=158ff662
quickpkg: Fix incorrect BINPKG_COMPRESS_FLAGS split. Bug: https://bugs.gentoo.org/857933 Signed-off-by: Sheng Yu <syu.os <AT> protonmail.com> Closes: https://github.com/gentoo/portage/pull/857 Signed-off-by: Sam James <sam <AT> gentoo.org> NEWS | 2 ++ bin/quickpkg | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 129416f50..634531453 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,8 @@ Bug fixes: started to show on every emerge, but is harmless and left over from many years ago). Bug #858407. +* quickpkg: Fix quoting/splitting of BINPKG_COMPRESS_FLAGS arguments. Bug #857933. + * estrip: fix double prefix (regression from "don't call estrip twice" fix in 3.0.31). Bug #858818. diff --git a/bin/quickpkg b/bin/quickpkg index b4ad43376..773c1c07e 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -167,10 +167,7 @@ def quickpkg_atom(options, infos, arg, eout): % (binpkg_compression, missing_package) ) return 1 - cmd = [ - varexpand(x, mydict=settings) - for x in shlex_split(compression["compress"]) - ] + cmd = shlex_split(varexpand(compression["compress"], mydict=settings)) # Filter empty elements that make Popen fail cmd = [x for x in cmd if x != ""] with open(binpkg_tmpfile, "wb") as fobj:
