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 2CF71158093 for ; Sat, 2 Jul 2022 17:48:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 743B9E0C3F; Sat, 2 Jul 2022 17:48:33 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D8C2E0C32 for ; Sat, 2 Jul 2022 17:48:33 +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 205B9341CF6 for ; Sat, 2 Jul 2022 17:48:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2046D5A4 for ; Sat, 2 Jul 2022 17:23:19 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1656782570.5c854cc776f8988a1a0b68ef62440e3ecf30fd17.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 5c854cc776f8988a1a0b68ef62440e3ecf30fd17 X-VCS-Branch: master Date: Sat, 2 Jul 2022 17:23:19 +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: e88984ed-3545-440c-9bb3-f7a04530da30 X-Archives-Hash: a894e6a1a0e0441b564e926619596b20 commit: 5c854cc776f8988a1a0b68ef62440e3ecf30fd17 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jul 2 17:22:50 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jul 2 17:22:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5c854cc7 scripts/bootstrap-prefix: missed one bit from cygwin patch due to merge-conflicts I missed this in previous commit :( Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index aecca9d3e2..1c85f79afb 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1089,7 +1089,7 @@ bootstrap_python() { < "${patch_folder}/python39.cygport" \ | grep -v rpm-wheels | grep -v revert-bpo ); do - pf="python36-${gitrev}/${pf}" + pf="${patch_folder}/${pf}" for pn in {1..2} fail; do if [[ ${pn} == fail ]]; then eerror "failed to apply ${pf}"