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/ebuild-helpers/
Date: Sat, 02 Jun 2012 02:46:01
Message-Id: 1338605137.27d7b258d23069f874ad8eceb35f58829cee85f3.zmedico@gentoo
1 commit: 27d7b258d23069f874ad8eceb35f58829cee85f3
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 2 02:45:37 2012 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 2 02:45:37 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=27d7b258
7
8 ecompressdir: avoid ecompress.break interference
9
10 ---
11 bin/ebuild-helpers/ecompressdir | 6 +++---
12 1 files changed, 3 insertions(+), 3 deletions(-)
13
14 diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
15 index f39f883..c77d998 100755
16 --- a/bin/ebuild-helpers/ecompressdir
17 +++ b/bin/ebuild-helpers/ecompressdir
18 @@ -164,13 +164,13 @@ for dir in "$@" ; do
19 : $(( ret |= $? ))
20 done
21
22 + multijob_finish
23 + : $(( ret |= $? ))
24 +
25 # forcibly break all hard links as some compressors whine about it
26 find "${dir}" -type f -links +1 -exec env file="{}" sh -c \
27 'cp -p "${file}" "${file}.ecompress.break" ; mv -f "${file}.ecompress.break" "${file}"' \;
28
29 - multijob_finish
30 - : $(( ret |= $? ))
31 -
32 # now lets do our work
33 if [[ -n ${suffix} ]] ; then
34 vecho "${0##*/}: $(ecompress --bin) /${actual_dir#${ED}}"