Update fix for Bug 232270 to utilize better patch from Ian Abbott.

svn path=/; revision=508

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 8f1956c10d5fef895131d0cb5aa2a8537c76a2b5..1fc3478db4cd58ae0150907f3c361e8fc4aa00db 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-26: Paul Varner <fuzzyray@gentoo.org>
+       * revdep-rebuild: Update fix for Bug 232270 to utilize better patch
+       from Ian Abbott.
+
 2008-08-22: Paul Varner <fuzzyray@gentoo.org>
        * gentoolkit: Fix find_packages and find_installed_packages to print
        a warning instead of a traceback when an InvalidAtom exception occurs.

diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index c2f3f570298d63daaf13552eae4f5d3f4a528809..3ffe9049420e620951a32dcbbbc8eb3a0268b19e 100755 (executable)
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -530,7 +530,7 @@ get_search_env() {
        if [[ "$uid" == "root" ]]; then
                local tmp_target="/var/cache/${APP_NAME}"
        else
-               local tmp_target=$(mktemp -d -t revdep-rebuild.XXXXXXXXXX)
+               local tmp_target="$(mktemp -d -t revdep-rebuild.XXXXXXXXXX)"
        fi
 
        # From here on all work is done inside the temporary directory
@@ -1011,11 +1011,11 @@ setup_search_paths_and_masks() {
        LD_LIBRARY_MASK=$(clean_var <<< "$LD_LIBRARY_MASK")
        # Filter masked paths from SEARCH_DIRS
        for sdir in ${SEARCH_DIRS} ; do
+               skip_me=
                for mdir in ${SEARCH_DIRS_MASK}; do
                        [[ ${sdir} == ${mdir}/* ]] && skip_me=1 && break
                done
                [[ -n ${skip_me} ]] || filter_SEARCH_DIRS+=" ${sdir}"
-               unset skip_me
        done
        SEARCH_DIRS=$(clean_var <<< "${filter_SEARCH_DIRS}")
        [[ $SEARCH_DIRS ]] || die 1 "No search defined -- this is a bug."