From b0531d2b31459ed44d8cff844132e696138cd3e5 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 27 Feb 2007 16:52:33 +0000 Subject: [PATCH] Merged from trunk 6085:6088 For compatibility with older findutils, don't use the -L predicate (bug #168432). For bug #168267, use add --force to the default PORTAGE_COMPRESS_FLAGS so that hardlinks are automatically broken. svn path=/main/branches/prefix/; revision=6090 --- bin/ecompress | 2 +- bin/ecompressdir | 5 +++-- man/make.conf.5 | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/ecompress b/bin/ecompress index 81451c9c8..6bd752818 100755 --- a/bin/ecompress +++ b/bin/ecompress @@ -14,7 +14,7 @@ source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions. PORTAGE_COMPRESS=${PORTAGE_COMPRESS:-bzip2} if [[ -z ${PORTAGE_COMPRESS_FLAGS} ]] ; then case ${PORTAGE_COMPRESS} in - bzip2|gzip) PORTAGE_COMPRESS_FLAGS="-9";; + bzip2|gzip) PORTAGE_COMPRESS_FLAGS="-f9";; esac fi diff --git a/bin/ecompressdir b/bin/ecompressdir index 243a6832c..62d9af5e0 100755 --- a/bin/ecompressdir +++ b/bin/ecompressdir @@ -32,8 +32,9 @@ funk_up_dir() { find "${dir}" -type f ${negate} -iname '*.'${suffix} -print0 | ${XARGS} -0 ${binary} ((ret+=$?)) - find -L "${dir}" -type l | \ - while read brokenlink ; do + find "${dir}" -type l -print0 | \ + while read -d $'\0' brokenlink ; do + [[ -e ${brokenlink} ]] && continue olddest=$(readlink "${brokenlink}") [[ ${act} == "compress" ]] \ && newdest="${olddest}${suffix}" \ diff --git a/man/make.conf.5 b/man/make.conf.5 index 168523efa..088a54ab2 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -329,7 +329,7 @@ the host that creates the binary packages and not to the root of the \fBPKGDIR\f This variable contains the command used to compress documentation during the install phase. .TP -\fBPORTAGE_COMPRESS_FLAGS\fR = \fI"\-9"\fR +\fBPORTAGE_COMPRESS_FLAGS\fR = \fI"\-f9"\fR This variable contains flags for the \fBPORTAGE_COMPRESS\fR command. .TP .B PORTAGE_ELOG_CLASSES -- 2.26.2