diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2005-11-03 03:43:06 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2005-11-03 03:43:06 +0000 |
| commit | 8b380ec5e61e5ac90ee58011b9965a9952bbfad4 (patch) | |
| tree | eef0622e434f56837fc06157a5a3b93b1526e156 /trunk | |
| parent | 749c34a0871eb63161ec2ae9f0c221f61053a329 (diff) | |
| download | gentoolkit-8b380ec5e61e5ac90ee58011b9965a9952bbfad4.tar.gz | |
Fix revdep-rebuild to work with findutils-4.2.25 (Bug 111203)
svn path=/; revision=252
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/ChangeLog | 3 | ||||
| -rwxr-xr-x | trunk/src/revdep-rebuild/revdep-rebuild | 11 |
2 files changed, 13 insertions, 1 deletions
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 <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 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 |