commit: 4a0421e1768dccafd4f9edb77f61cc186afb18d3
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 00:29:27 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 00:41:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4a0421e1
BinpkgExtractorAsync: use posix compatible head arguments (bug 640450)
Fixes: b4b0e6b0aaa1 ("BinpkgExtractorAsync: remove trailer when decompressing
binary packages")
Bug: https://bugs.gentoo.org/640450
pym/_emerge/BinpkgExtractorAsync.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pym/_emerge/BinpkgExtractorAsync.py
b/pym/_emerge/BinpkgExtractorAsync.py
index 07ba2a1b7..4468efde6 100644
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/pym/_emerge/BinpkgExtractorAsync.py
@@ -80,7 +80,7 @@ class BinpkgExtractorAsync(SpawnProcess):
# 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",
- ("cmd0=(head -c-%d -- %s) cmd1=(%s) cmd2=(tar -xp %s -C
%s -f -); " + \
+ ("cmd0=(head -c %d -- %s) cmd1=(%s) cmd2=(tar -xp %s -C
%s -f -); " + \
'"${cmd0[@]}" | "${cmd1[@]}" | "${cmd2[@]}"; ' + \
"p=(${PIPESTATUS[@]}) ; for i in {0..2}; do " + \
"if [[ ${p[$i]} != 0 && ${p[$i]} != %d ]] ; then " + \
@@ -90,7 +90,7 @@ class BinpkgExtractorAsync(SpawnProcess):
"echo command $(eval \"echo \\\"'\\${cmd$i[*]}'\\\"\")
" + \
"failed with status ${p[$i]} ; exit ${p[$i]} ; fi ; " +
\
"exit 0 ;") % \
- (pkg_xpak.xpaksize,
+ (pkg_xpak.filestat.st_size - pkg_xpak.xpaksize,
portage._shell_quote(self.pkg_path),
decomp_cmd,
tar_options,
