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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A24E138334 for ; Sun, 15 Dec 2019 22:02:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B1E4E087A; Sun, 15 Dec 2019 22:02:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56B71E087A for ; Sun, 15 Dec 2019 22:02:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36B0034D8C7 for ; Sun, 15 Dec 2019 22:02:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DD6D905 for ; Sun, 15 Dec 2019 22:01:59 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1576398381.b39c1731abd2b16e31e98e8deba9699dd73bbf7c.zmedico@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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b39c1731abd2b16e31e98e8deba9699dd73bbf7c X-VCS-Branch: master Date: Sun, 15 Dec 2019 22:01:59 +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: 073490e0-a133-4f1b-9253-2537a25b42e1 X-Archives-Hash: 5b31e9805684c2b850eb64ca23ebac56 commit: b39c1731abd2b16e31e98e8deba9699dd73bbf7c Author: Zac Medico gentoo org> AuthorDate: Sun Dec 15 08:14:00 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Dec 15 08:26:21 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b39c1731 emerge-webrsync: support gentoo-YYYYMMDD snapshots Support gentoo-YYYYMMDD snapshots for forward compatibility, and portage-YYYYMMDD snapshots for backward compatibility. Bug: https://bugs.gentoo.org/693454 Signed-off-by: Zac Medico gentoo.org> bin/emerge-webrsync | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 5fe30133d..c259b7daa 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -303,15 +303,15 @@ do_snapshot() { local r=1 - local base_file="portage-${date}.tar" + local compression local have_files=0 local mirror local compressions="" - type -P xzcat > /dev/null && compressions="${compressions} xz" - type -P bzcat > /dev/null && compressions="${compressions} bz2" - type -P zcat > /dev/null && compressions="${compressions} gz" + type -P xzcat > /dev/null && compressions="${compressions} ${repo_name}:xz portage:xz" + type -P bzcat > /dev/null && compressions="${compressions} ${repo_name}:bz2 portage:bz2" + type -P zcat > /dev/null && compressions="${compressions} ${repo_name}:gz portage:gz" if [[ -z ${compressions} ]] ; then eecho "unable to locate any decompressors (xzcat or bzcat or zcat)" exit 1 @@ -323,7 +323,9 @@ do_snapshot() { __vecho "Trying to retrieve ${date} snapshot from ${mirror} ..." for compression in ${compressions} ; do - local file="portage-${date}.tar.${compression}" + local name=${compression%%:*} + compression=${compression#*:} + local file="${name}-${date}.tar.${compression}" local digest="${file}.md5sum" local signature="${file}.gpgsig"