Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Tue, 25 Sep 2018 21:04:51
Message-Id: 1537909275.8a1d36088aa54ecb087e76fef166d51a6d5383f7.zmedico@gentoo
1 commit: 8a1d36088aa54ecb087e76fef166d51a6d5383f7
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 25 20:58:40 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 25 21:01:15 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8a1d3608
7
8 Revert "ecompress: Run compression in parallel" (bug 667072)
9
10 This reverts commit 289d9a17dc9d9287e5dcb75f84b38ad0388e5fde.
11 The parallel ecompress-file calls can interfere with eachoter
12 if a file is installed with both compressed and uncompressed
13 forms. Since compressed files are typically very small,
14 parallel compression is typically not very helpful anyway.
15
16 Bug: https://bugs.gentoo.org/667072
17 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
18
19 bin/ecompress | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22 diff --git a/bin/ecompress b/bin/ecompress
23 index 36bdb585b..434456f0c 100755
24 --- a/bin/ecompress
25 +++ b/bin/ecompress
26 @@ -139,8 +139,8 @@ fix_symlinks() {
27 }
28
29 export PORTAGE_COMPRESS PORTAGE_COMPRESS_FLAGS
30 -find "${ED}" -name '*.ecompress' -delete -print0 |
31 - ___parallel_xargs -0 "${PORTAGE_BIN_PATH}"/ecompress-file
32 +find "${ED}" -name '*.ecompress' -delete \
33 + -exec "${PORTAGE_BIN_PATH}"/ecompress-file {} +
34 ret=${?}
35
36 fix_symlinks