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 ECF18158451 for ; Tue, 9 Jan 2024 06:41:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E72EEE2A85; Tue, 9 Jan 2024 06:41:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D0C4AE2A84 for ; Tue, 9 Jan 2024 06:41:40 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED02A3432F9 for ; Tue, 9 Jan 2024 06:41:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58DDD1437 for ; Tue, 9 Jan 2024 06:41:38 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1704782176.c7f6ebbe26db3f2c9dd656438664109ec1329ab1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/cargo.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c7f6ebbe26db3f2c9dd656438664109ec1329ab1 X-VCS-Branch: master Date: Tue, 9 Jan 2024 06:41:38 +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: 3916a6ef-2712-4511-84ea-312040b911f1 X-Archives-Hash: e553f746f604504c53f527f4f837e4cf commit: c7f6ebbe26db3f2c9dd656438664109ec1329ab1 Author: Michał Górny gentoo org> AuthorDate: Tue Jan 9 06:36:16 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jan 9 06:36:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f6ebbe cargo.eclass: Revert PKGBUMPING for CARGO_CRATE_URIS Setting PKGBUMPING would result in empty crate URI list which is incorrect when used inside an USE-conditional group. Signed-off-by: Michał Górny gentoo.org> eclass/cargo.eclass | 3 --- 1 file changed, 3 deletions(-) diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 7bdd548b0df8..3bdbb5e3ec64 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -175,9 +175,6 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo" # If no arguments are provided, it uses the CRATES variable. # The value is set as CARGO_CRATE_URIS. _cargo_set_crate_uris() { - # when called by pkgbump, do not fetch crates - [[ ${PKGBUMPING} == ${PVR} ]] && return - local -r regex='^([a-zA-Z0-9_\-]+)-([0-9]+\.[0-9]+\.[0-9]+.*)$' local crates=${1} local crate