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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21A281382C5 for ; Wed, 24 Jun 2020 03:01:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06E37E084E; Wed, 24 Jun 2020 03:01:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA6EAE084E for ; Wed, 24 Jun 2020 03:01:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FC7234F171 for ; Wed, 24 Jun 2020 03:01:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A31B09C for ; Wed, 24 Jun 2020 03:01:01 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1592958780.2f21153a85d43ea466a3289a833f35f1049314cf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ecompress X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2f21153a85d43ea466a3289a833f35f1049314cf X-VCS-Branch: master Date: Wed, 24 Jun 2020 03:01:01 +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: 2a36c810-bc6a-4dae-ac39-aea123d7f305 X-Archives-Hash: 6d9b4dea00f3f0751f10b46eaa98f91a commit: 2f21153a85d43ea466a3289a833f35f1049314cf Author: Patrick McLean gentoo org> AuthorDate: Wed Jun 24 00:25:07 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 24 00:33:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2f21153a ecompress: fix "Argument list too long" for sed (bug 727522) Use sed -f to feed commands to sed via stdin, in order to avoid the "Argument list too long" error reported in bug 727522. Fixes: 5508bf7a6db5 ("ecompress: ignore docompress -x files in precompressed QA check (bug 721516)") Bug: https://bugs.gentoo.org/727522 Signed-off-by: Zac Medico gentoo.org> bin/ecompress | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/ecompress b/bin/ecompress index 7aabc8e4c..1ab07ccd7 100755 --- a/bin/ecompress +++ b/bin/ecompress @@ -38,9 +38,10 @@ while [[ $# -gt 0 ]] ; do if [[ ${#skip_files[@]} -gt 0 && -s ${T}/.ecompress_had_precompressed ]]; then sed_args=() for f in "${skip_files[@]}"; do - sed_args+=(-e "s|^${f}\$||") + sed_args+=("s|^${f}\$||;") done - sed "${sed_args[@]}" -e '/^$/d' -i "${T}/.ecompress_had_precompressed" || die + sed_args+=('/^$/d') + sed -f - -i "${T}/.ecompress_had_precompressed" <<< "${sed_args[@]}" || die fi exit 0