From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id A1B8F15806C for ; Sun, 13 Jul 2025 04:19:57 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 7F901341F1B for ; Sun, 13 Jul 2025 04:19:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 71DB511055D; Sun, 13 Jul 2025 04:19:52 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 61D0411055C for ; Sun, 13 Jul 2025 04:19:52 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3E21341F0F for ; Sun, 13 Jul 2025 04:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 887C730D1 for ; Sun, 13 Jul 2025 04:19:50 +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: <1752380341.20983950939ebc3af73bf906f46a7a3913e7a0b0.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emerge-webrsync X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 20983950939ebc3af73bf906f46a7a3913e7a0b0 X-VCS-Branch: master Date: Sun, 13 Jul 2025 04:19:50 +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: c98bc71d-52af-4a04-8f9f-322c7a9fee40 X-Archives-Hash: 8207a06599e6634f9f6d92c5b36d650b commit: 20983950939ebc3af73bf906f46a7a3913e7a0b0 Author: Kerin Millar plushkava net> AuthorDate: Fri Jul 4 15:08:28 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 13 04:19:01 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=20983950 emerge-webrsync: drop the signature and digest variables from do_snapshot() Jettison the 'signature' and 'digest' variables from the do_snapshot() function. They were not particularly useful, nor did they render the code any clearer. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index c3514bf2ae..22e1699db4 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -467,7 +467,7 @@ sync_local() { do_snapshot() { local ignore_timestamp=$1 date=$2 - local have_files signature digest mirror file + local have_files mirror file local -a tarballs mirrors local -A suffix_by @@ -488,19 +488,16 @@ do_snapshot() { for mirror in "${mirrors[@]/%\/}"; do einfo "Trying to retrieve ${date} snapshot from ${mirror} ..." for file in "${tarballs[@]}"; do - digest="${file}.md5sum" - signature="${file}.gpgsig" - - test -s "${DISTDIR}/${file}" \ - && test -s "${DISTDIR}/${digest}" \ - && test -s "${DISTDIR}/${signature}" \ + test -s "${DISTDIR}/${file}.md5sum" \ + && test -s "${DISTDIR}/${file}.gpgsig" \ + && test -s "${DISTDIR}/${file}" \ && check_file_digest "${DISTDIR}/${file}" \ && check_file_signature "${DISTDIR}/${file}" \ && have_files=1 if (( ! have_files )); then - fetch_file "${mirror}/snapshots/${digest}" \ - && fetch_file "${mirror}/snapshots/${signature}" \ + fetch_file "${mirror}/snapshots/${file}.md5sum" \ + && fetch_file "${mirror}/snapshots/${file}.gpgsig" \ && fetch_file "${mirror}/snapshots/${file}" \ && check_file_digest "${DISTDIR}/${file}" \ && check_file_signature "${DISTDIR}/${file}" \ @@ -515,7 +512,7 @@ do_snapshot() { break 2 else # Remove files and use a different mirror - rm -f -- "${DISTDIR}"/{"$file","$digest","$signature"} + rm -f -- "${DISTDIR}/${file}"{".md5sum",".gpgsig",} fi done done