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 8B3AE158074 for ; Mon, 23 Jun 2025 10:37: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 77EC2340BDE for ; Mon, 23 Jun 2025 10:37:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 30D2611055E; Mon, 23 Jun 2025 10:37:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1CE7A11055E for ; Mon, 23 Jun 2025 10:37:41 +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 CEB113410D9 for ; Mon, 23 Jun 2025 10:37:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A65512A77 for ; Mon, 23 Jun 2025 10:37:38 +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: <1750675047.de7dbef028b087bf8a758e09fbadd641f54cd74b.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: de7dbef028b087bf8a758e09fbadd641f54cd74b X-VCS-Branch: master Date: Mon, 23 Jun 2025 10:37: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: 011ee72a-349e-425e-81bb-b42a026c6a2f X-Archives-Hash: bc48c09dcac762fbd1a4290ceb13825d commit: de7dbef028b087bf8a758e09fbadd641f54cd74b Author: Kerin Millar plushkava net> AuthorDate: Mon Jun 23 09:21:45 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 23 10:37:27 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=de7dbef0 emerge-webrsync: don't delete downloaded files after calling sync_local() As concerns the do_snapshot() function, refrain from deleting the downloaded files after having successfully called the sync_local() function in the event that the --keep option was not specified. There is no need to do so because, where the 'DISTDIR' variable is set to the value of 'tmpdir', it is already guaranteed that the files will be removed by the cleanup() function. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 835405a1d7..4b84483078 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -525,8 +525,7 @@ do_snapshot() { done if (( have_files )); then - sync_local "${DISTDIR}/${file}" \ - && { (( opt[keep] )) || rm -f -- "${DISTDIR}"/{"$file","$digest","$signature"}; } + sync_local "${DISTDIR}/${file}" else ewarn "${date} snapshot was not found" false