[prev in list] [next in list] [prev in thread] [next in thread]
List: gentoo-portage-dev
Subject: [gentoo-portage-dev] [PATCH] emerge-webrsync: support gentoo-YYYYMMDD snapshots
From: Zac Medico <zmedico () gentoo ! org>
Date: 2019-12-15 8:24:01
Message-ID: 20191215082401.3042-1-zmedico () gentoo ! org
[Download RAW message or body]
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 <zmedico@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..0740cc97b 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}:xz portage:xz"
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"
--
2.21.0
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic