From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 4 Sep 2010 09:02:29 +0000 (-0700)
Subject: In BinpkgExtractorAsync, add -q to bzip2 opts, in order to avoid
X-Git-Tag: v2.2_rc76~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=085fef93542a0f1839a70826abbd0dfeb6546bec;p=portage.git

In BinpkgExtractorAsync, add -q to bzip2 opts, in order to avoid
"trailing garbage after EOF ignored" warning messages due to xpak
trailer.
---

diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtractorAsync.py
index 004544e92..d1630f242 100644
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/pym/_emerge/BinpkgExtractorAsync.py
@@ -13,10 +13,12 @@ class BinpkgExtractorAsync(SpawnProcess):
 	_shell_binary = portage.const.BASH_BINARY
 
 	def _start(self):
+		# Add -q to bzip2 opts, in order to avoid "trailing garbage after
+		# EOF ignored" warning messages due to xpak trailer.
 		# SIGPIPE handling (128 + SIGPIPE) should be compatible with
 		# assert_sigpipe_ok() that's used by the ebuild unpack() helper.
 		self.args = [self._shell_binary, "-c",
-			("${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -c -- %s | tar -xp -C %s -f - ; " + \
+			("${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -cq -- %s | tar -xp -C %s -f - ; " + \
 			"p=(${PIPESTATUS[@]}) ; " + \
 			"if [[ ${p[0]} != 0 && ${p[0]} != %d ]] ; then " % (128 + signal.SIGPIPE) + \
 			"echo bzip2 failed with status ${p[0]} ; exit ${p[0]} ; fi ; " + \