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 C933B158074 for ; Fri, 04 Jul 2025 02:19:16 +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 B56D93420CE for ; Fri, 04 Jul 2025 02:19:16 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C85C6110561; Fri, 04 Jul 2025 02:19:04 +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 B75C4110561 for ; Fri, 04 Jul 2025 02:19:04 +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 69FE5342047 for ; Fri, 04 Jul 2025 02:19:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E2EC2D13 for ; Fri, 04 Jul 2025 02:19:02 +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: <1751595424.4ee9caca31ad32d41f70835f83bf50ba50698108.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: 4ee9caca31ad32d41f70835f83bf50ba50698108 X-VCS-Branch: master Date: Fri, 04 Jul 2025 02:19:02 +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: 01652dec-1672-45ed-9bfa-50ca6d883a41 X-Archives-Hash: 40854c3213ef79fa2a2a4bf215cc005e commit: 4ee9caca31ad32d41f70835f83bf50ba50698108 Author: Kerin Millar plushkava net> AuthorDate: Thu Jul 3 16:48:12 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 4 02:17:04 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4ee9caca emerge-webrsync: show only the tarball basename in sync_local() Presently, the sync_local() function features several informational and diagnostic messages that convey the name of the tarball. However, some of them show only its filename, whereas others show its full pathname. Consistently show only the filename. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 2719e60486..c011c0cf6e 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -392,7 +392,7 @@ get_snapshot_timestamp() { sync_local() { local file=$1 - local ownership snapshot_dir + local snapshot_dir ownership tarball local -a tarsync_opts rsync_opts if ! contains_word usersync "${FEATURES}"; then @@ -403,6 +403,8 @@ sync_local() { ownership=$(stat -c '%U:%G' -- "${repo_location}") fi || exit + tarball=${file##*/} + if hash tarsync 2>/dev/null; then einfo "Using tarsync to refresh ${repo_location@Q} ..." @@ -414,19 +416,17 @@ sync_local() { tarsync_opts+=( -v ) fi if ! tarsync "${tarsync_opts[@]}" -- "${file}" "${repo_location}"; then - file=${file##*/} - eerror "Failed to sync ${repo_location@Q} with ${file@Q}" + eerror "Failed to sync ${repo_location@Q} with ${tarball@Q}" return 1 fi else - einfo "Extracting ${file@Q} ..." + einfo "Extracting ${tarball@Q} ..." snapshot_dir=${tmpdir:?}/snapshot mkdir -- "${snapshot_dir}" && cd -- "${snapshot_dir}" || exit if ! do_tar "${file}" -x --strip-components=1 -f -; then - file=${file##*/} - eerror "Failed to extract the contents of ${file@Q}" + eerror "Failed to extract the contents of ${tarball@Q}" return 1 fi