From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 15 Aug 2010 05:18:17 +0000 (-0700)
Subject: Bug #332799 - Don't download lzma snapshots if tarsync is installed.
X-Git-Tag: v2.2_rc68~207
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df3921f0ea835a62ea417c9074f3c9ab87c59b64;p=portage.git

Bug #332799 - Don't download lzma snapshots if tarsync is installed.
---

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 6964168b6..e3ec5f639 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -226,12 +226,9 @@ do_snapshot() {
 	local mirror
 
 	local compressions=""
-	# lzma is not supported in <=app-arch/tarsync-0.2.1, so use
-	# bz2 format if we have an old version of tarsync.
-	if type -P tarsync > /dev/null && \
-		portageq has_version / '<=app-arch/tarsync-0.2.1' ; then
-		true
-	else
+	# lzma is not supported in app-arch/tarsync, so use
+	# bz2 format if we have tarsync.
+	if ! type -P tarsync > /dev/null ; then
 		type -P lzcat > /dev/null && compressions="${compressions} lzma"
 	fi
 	type -P bzcat > /dev/null && compressions="${compressions} bz2"