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 D9C7A138239 for ; Mon, 25 Nov 2019 16:59:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18CBAE09C8; Mon, 25 Nov 2019 16:59:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 F2D39E09C8 for ; Mon, 25 Nov 2019 16:59:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 00C1B34D383 for ; Mon, 25 Nov 2019 16:59:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E541A8 for ; Mon, 25 Nov 2019 16:59:52 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1574686993.12d0c48addaf4506dfd7b33f85f2441618a46dd2.ulm@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-helpers.sh X-VCS-Directories: bin/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 12d0c48addaf4506dfd7b33f85f2441618a46dd2 X-VCS-Branch: master Date: Mon, 25 Nov 2019 16:59:52 +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: 34eb59d9-79e8-4d2b-9067-ed91a538cfa5 X-Archives-Hash: c643c5d248944e8a244a3ca284cb3a02 commit: 12d0c48addaf4506dfd7b33f85f2441618a46dd2 Author: Ulrich Müller gentoo org> AuthorDate: Mon Nov 25 13:03:13 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Nov 25 13:03:13 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=12d0c48a eapply: Drop -s option for patch. We generally try to have verbose build logs, e.g., by calling configure with --disable-silent-rules. Silencing patch contradicts this, and will suppress reporting of fuzz factors. Note that the eapply specification in PMS calls patch without -s: https://projects.gentoo.org/pms/7/pms.html#x1-127001r1 Traditionally, the -s option wasn't used by epatch either. Bug: https://bugs.gentoo.org/674562 Signed-off-by: Ulrich Müller gentoo.org> bin/phase-helpers.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index b53d39650..60f8d3243 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -993,10 +993,9 @@ if ___eapi_has_eapply; then ebegin "${prefix:-Applying }${f##*/}" # -p1 as a sane default # -f to avoid interactivity - # -s to silence progress output # -g0 to guarantee no VCS interaction # --no-backup-if-mismatch not to pollute the sources - ${patch_cmd} -p1 -f -s -g0 --no-backup-if-mismatch \ + ${patch_cmd} -p1 -f -g0 --no-backup-if-mismatch \ "${patch_options[@]}" < "${f}" failed=${?} if ! eend "${failed}"; then