From 8b380ec5e61e5ac90ee58011b9965a9952bbfad4 Mon Sep 17 00:00:00 2001 From: fuzzyray Date: Thu, 3 Nov 2005 03:43:06 +0000 Subject: [PATCH] Fix revdep-rebuild to work with findutils-4.2.25 (Bug 111203) svn path=/; revision=252 --- trunk/ChangeLog | 3 +++ trunk/src/revdep-rebuild/revdep-rebuild | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 9aad3ae..39c8104 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,6 @@ +2005-11-02 Paul Varner + * revdep-rebuild: Fix to work with findutils-4.2.25 (Bug 111203) + 2005-10-18 Paul Varner * equery: Make equery look at both DEPEND and RDEPEND for dependencies * gentoolkit: Fix _parse_deps to understand || syntax (Bug 101377) diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild index e08c0dd..317cf3d 100755 --- a/trunk/src/revdep-rebuild/revdep-rebuild +++ b/trunk/src/revdep-rebuild/revdep-rebuild @@ -319,7 +319,16 @@ else set_trap "$LIST.1_*" - find $SEARCH_DIRS -type f \( -perm +u+x -o -name '*.so' -o -name '*.so.*' \) 2>/dev/null | sort | uniq >$LIST.0_files + # Hack for broken versions of find. I'm using a case statement in case I have to add more + find_version=$(find --version 2>/dev/null | awk '/find/ {print $NF}') + case "$find_version" in + 4.2.25 ) + find $SEARCH_DIRS -type f \( -perm /u+x -o -name '*.so' -o -name '*.so.*' \) 2>/dev/null | sort | uniq >$LIST.0_files + ;; + * ) + find $SEARCH_DIRS -type f \( -perm +u+x -o -name '*.so' -o -name '*.so.*' \) 2>/dev/null | sort | uniq >$LIST.0_files + ;; + esac # Remove files that match SEARCH_DIR_MASK for dir in $SEARCH_DIRS_MASK -- 2.26.2