Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10056 - main/trunk/bin
Date: Thu, 01 May 2008 07:26:40
Message-Id: E1JrTBd-0000L5-OX@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-05-01 07:26:36 +0000 (Thu, 01 May 2008)
3 New Revision: 10056
4
5 Modified:
6 main/trunk/bin/emerge-webrsync
7 Log:
8 Detect an old version of tarsync and use bzip2 compression in that case.
9
10
11 Modified: main/trunk/bin/emerge-webrsync
12 ===================================================================
13 --- main/trunk/bin/emerge-webrsync 2008-05-01 05:43:32 UTC (rev 10055)
14 +++ main/trunk/bin/emerge-webrsync 2008-05-01 07:26:36 UTC (rev 10056)
15 @@ -173,8 +173,7 @@
16
17 vecho "Syncing local tree ..."
18
19 - # tarsync-0.2.1 doesn't seem to support lzma compression.
20 - if [ "${file##*.}" != "lzma" ] && type -P tarsync > /dev/null; then
21 + if type -P tarsync > /dev/null ; then
22 if ! tarsync $(vvecho -v) -s 1 -o portage -g portage -e /distfiles -e /packages -e /local "${file}" "${PORTDIR}"; then
23 eecho "tarsync failed; tarball is corrupt? (${file})"
24 return 1
25 @@ -221,7 +220,14 @@
26 local mirror
27
28 local compressions=""
29 - type -P lzcat > /dev/null && compressions="${compressions} lzma"
30 + # lzma is not supported in <=app-arch/tarsync-0.2.1, so use
31 + # bz2 format if we have an old version of tarsync.
32 + if type -P tarsync > /dev/null && \
33 + portageq has_version / '<=app-arch/tarsync-0.2.1' ; then
34 + true
35 + else
36 + type -P lzcat > /dev/null && compressions="${compressions} lzma"
37 + fi
38 type -P bzcat > /dev/null && compressions="${compressions} bz2"
39 type -P zcat > /dev/null && compressions="${compressions} gz"
40 if [[ -z ${compressions} ]] ; then
41
42 --
43 gentoo-commits@l.g.o mailing list