From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6365F158094 for ; Mon, 18 Jul 2022 20:42:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BCA6E0DDB; Mon, 18 Jul 2022 20:42:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B597E0DDB for ; Mon, 18 Jul 2022 20:42:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D8ED340F3A for ; Mon, 18 Jul 2022 20:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8BCA500 for ; Mon, 18 Jul 2022 20:42:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1658176917.158ff662921150011fdd9929e8e7d5f4be946a5d.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: /, bin/ X-VCS-Repository: proj/portage X-VCS-Files: NEWS bin/quickpkg X-VCS-Directories: bin/ / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 158ff662921150011fdd9929e8e7d5f4be946a5d X-VCS-Branch: master Date: Mon, 18 Jul 2022 20:42:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6cc62570-2a52-4ab7-807c-bae0fbcd33d2 X-Archives-Hash: 1bde174694f4019094678cfc140cb1e2 commit: 158ff662921150011fdd9929e8e7d5f4be946a5d Author: Sheng Yu protonmail com> AuthorDate: Sun Jul 17 23:00:14 2022 +0000 Commit: Sam James gentoo 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 protonmail.com> Closes: https://github.com/gentoo/portage/pull/857 Signed-off-by: Sam James 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: