| 1 |
Support gentoo-YYYYMMDD snapshots for forward compatibility, and |
| 2 |
portage-YYYYMMDD snapshots for backward compatibility. |
| 3 |
|
| 4 |
Bug: https://bugs.gentoo.org/693454 |
| 5 |
Signed-off-by: Zac Medico <zmedico@g.o> |
| 6 |
--- |
| 7 |
bin/emerge-webrsync | 12 +++++++----- |
| 8 |
1 file changed, 7 insertions(+), 5 deletions(-) |
| 9 |
|
| 10 |
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync |
| 11 |
index 5fe30133d..0740cc97b 100755 |
| 12 |
--- a/bin/emerge-webrsync |
| 13 |
+++ b/bin/emerge-webrsync |
| 14 |
@@ -303,15 +303,15 @@ do_snapshot() { |
| 15 |
|
| 16 |
local r=1 |
| 17 |
|
| 18 |
- local base_file="portage-${date}.tar" |
| 19 |
+ local compression |
| 20 |
|
| 21 |
local have_files=0 |
| 22 |
local mirror |
| 23 |
|
| 24 |
local compressions="" |
| 25 |
- type -P xzcat > /dev/null && compressions="${compressions} xz" |
| 26 |
- type -P bzcat > /dev/null && compressions="${compressions} bz2" |
| 27 |
- type -P zcat > /dev/null && compressions="${compressions} gz" |
| 28 |
+ type -P xzcat > /dev/null && compressions="${compressions} ${repo_name}:xz portage:xz" |
| 29 |
+ type -P bzcat > /dev/null && compressions="${compressions} ${repo_name}:bz2 portage:bz2" |
| 30 |
+ type -P zcat > /dev/null && compressions="${compressions} ${repo_name}:xz portage:xz" |
| 31 |
if [[ -z ${compressions} ]] ; then |
| 32 |
eecho "unable to locate any decompressors (xzcat or bzcat or zcat)" |
| 33 |
exit 1 |
| 34 |
@@ -323,7 +323,9 @@ do_snapshot() { |
| 35 |
__vecho "Trying to retrieve ${date} snapshot from ${mirror} ..." |
| 36 |
|
| 37 |
for compression in ${compressions} ; do |
| 38 |
- local file="portage-${date}.tar.${compression}" |
| 39 |
+ local name=${compression%%:*} |
| 40 |
+ compression=${compression#*:} |
| 41 |
+ local file="${name}-${date}.tar.${compression}" |
| 42 |
local digest="${file}.md5sum" |
| 43 |
local signature="${file}.gpgsig" |
| 44 |
|
| 45 |
-- |
| 46 |
2.21.0 |
Archives