Gentoo Archives: gentoo-commits

From: "Paul Varner (fuzzyray)" <fuzzyray@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoolkit r508 - in trunk: . src/revdep-rebuild
Date: Tue, 26 Aug 2008 19:46:24
Message-Id: E1KY4Ue-0008TS-SL@stork.gentoo.org
1 Author: fuzzyray
2 Date: 2008-08-26 19:46:19 +0000 (Tue, 26 Aug 2008)
3 New Revision: 508
4
5 Modified:
6 trunk/ChangeLog
7 trunk/src/revdep-rebuild/revdep-rebuild
8 Log:
9 Update fix for Bug 232270 to utilize better patch from Ian Abbott.
10
11 Modified: trunk/ChangeLog
12 ===================================================================
13 --- trunk/ChangeLog 2008-08-22 21:38:27 UTC (rev 507)
14 +++ trunk/ChangeLog 2008-08-26 19:46:19 UTC (rev 508)
15 @@ -1,3 +1,7 @@
16 +2008-08-26: Paul Varner <fuzzyray@g.o>
17 + * revdep-rebuild: Update fix for Bug 232270 to utilize better patch
18 + from Ian Abbott.
19 +
20 2008-08-22: Paul Varner <fuzzyray@g.o>
21 * gentoolkit: Fix find_packages and find_installed_packages to print
22 a warning instead of a traceback when an InvalidAtom exception occurs.
23
24 Modified: trunk/src/revdep-rebuild/revdep-rebuild
25 ===================================================================
26 --- trunk/src/revdep-rebuild/revdep-rebuild 2008-08-22 21:38:27 UTC (rev 507)
27 +++ trunk/src/revdep-rebuild/revdep-rebuild 2008-08-26 19:46:19 UTC (rev 508)
28 @@ -530,7 +530,7 @@
29 if [[ "$uid" == "root" ]]; then
30 local tmp_target="/var/cache/${APP_NAME}"
31 else
32 - local tmp_target=$(mktemp -d -t revdep-rebuild.XXXXXXXXXX)
33 + local tmp_target="$(mktemp -d -t revdep-rebuild.XXXXXXXXXX)"
34 fi
35
36 # From here on all work is done inside the temporary directory
37 @@ -1011,11 +1011,11 @@
38 LD_LIBRARY_MASK=$(clean_var <<< "$LD_LIBRARY_MASK")
39 # Filter masked paths from SEARCH_DIRS
40 for sdir in ${SEARCH_DIRS} ; do
41 + skip_me=
42 for mdir in ${SEARCH_DIRS_MASK}; do
43 [[ ${sdir} == ${mdir}/* ]] && skip_me=1 && break
44 done
45 [[ -n ${skip_me} ]] || filter_SEARCH_DIRS+=" ${sdir}"
46 - unset skip_me
47 done
48 SEARCH_DIRS=$(clean_var <<< "${filter_SEARCH_DIRS}")
49 [[ $SEARCH_DIRS ]] || die 1 "No search defined -- this is a bug."