Fix revdep-rebuild to work with findutils-4.2.25 (Bug 111203)

svn path=/; revision=252

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 9aad3aed58c467bd90caf7571e534ad96f894e54..39c810429c65f8c6661ca4cc32813af4f2c8c71c 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,6 @@
+2005-11-02 Paul Varner <fuzzyray@gentoo.org>
+       * revdep-rebuild: Fix to work with findutils-4.2.25 (Bug 111203)
+
 2005-10-18 Paul Varner <fuzzyray@gentoo.org>
        * 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 e08c0ddda540de2f46717006b031f14eff03af46..317cf3de7df006c21d2eebd6a13c1b4b0f25b1b7 100755 (executable)
--- 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