Gentoo Archives: gentoo-commits

From: "Paul Varner (fuzzyray)" <fuzzyray@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoolkit r521 - trunk/src/revdep-rebuild
Date: Mon, 24 Nov 2008 19:10:45
Message-Id: E1L4gpX-00040L-6F@stork.gentoo.org
1 Author: fuzzyray
2 Date: 2008-11-24 19:10:42 +0000 (Mon, 24 Nov 2008)
3 New Revision: 521
4
5 Modified:
6 trunk/src/revdep-rebuild/revdep-rebuild
7 Log:
8 Added patch from igli to fix find command.
9
10 Modified: trunk/src/revdep-rebuild/revdep-rebuild
11 ===================================================================
12 --- trunk/src/revdep-rebuild/revdep-rebuild 2008-11-11 19:36:02 UTC (rev 520)
13 +++ trunk/src/revdep-rebuild/revdep-rebuild 2008-11-24 19:10:42 UTC (rev 521)
14 @@ -123,6 +123,7 @@
15 eerror "I was instructed to rm '$@'"
16 die 1 "Refusing to delete anything before changing to temporary directory."
17 }
18 +: <<'EW'
19 ##
20 # GNU find has -executable, but if our users' finds do not have that flag
21 # we emulate it with this function. Also emulates -writable and -readable.
22 @@ -158,6 +159,7 @@
23 fi
24 find "$@"
25 }
26 +EW
27
28 print_usage() {
29 cat << EOF
30 @@ -633,8 +635,8 @@
31 findMask="${findMask[@]/#/-o -path }"
32 findMask="( ${findMask#-o } ) -prune -o"
33 fi
34 - # TODO: Check this
35 - find ${SEARCH_DIRS[@]} $findMask -type f \( -executable -o \
36 + # TODO: Check this -- afaict SEARCH_DIRS isn't an array, so this should just be $SEARCH_DIRS?
37 + find ${SEARCH_DIRS[@]} $findMask -type f \( -perm -u+x -o -perm -g+x -o -perm -o+x -o \
38 -name '*.so' -o -name '*.so.*' -o -name '*.la' \) -print 2> /dev/null |
39 sort -u > "$FILES_FILE" ||
40 die $? "find failed to list binary files (This is a bug.)"