diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-09-04 02:02:29 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-04 02:02:29 -0700 |
| commit | 085fef93542a0f1839a70826abbd0dfeb6546bec (patch) | |
| tree | 6c10e143513964c97933c661686367e4981d3e6f /pym/_emerge/BinpkgExtractorAsync.py | |
| parent | Replace svn-trunk with VERSION in doc/fragment/version, for use as a (diff) | |
| download | portage-085fef93542a0f1839a70826abbd0dfeb6546bec.tar.gz portage-085fef93542a0f1839a70826abbd0dfeb6546bec.tar.bz2 portage-085fef93542a0f1839a70826abbd0dfeb6546bec.zip | |
In BinpkgExtractorAsync, add -q to bzip2 opts, in order to avoid
"trailing garbage after EOF ignored" warning messages due to xpak
trailer.
Diffstat (limited to 'pym/_emerge/BinpkgExtractorAsync.py')
| -rw-r--r-- | pym/_emerge/BinpkgExtractorAsync.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 ; " + \ |