diff options
| author |   fuzzyray <fuzzyray@gentoo.org> | 2008-08-26 19:46:19 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2008-08-26 19:46:19 +0000 |
| commit | facfad5d5b1c6bbb7a5a4405dd79e5e5d9891d7d (patch) | |
| tree | b02b5e0e5baf5b06fce89dab9f14568929d98b9c | |
| parent | Fix find_packages and find_installed_packages to print a warning instead of a... (diff) | |
| download | gentoolkit-facfad5d5b1c6bbb7a5a4405dd79e5e5d9891d7d.tar.gz gentoolkit-facfad5d5b1c6bbb7a5a4405dd79e5e5d9891d7d.tar.bz2 gentoolkit-facfad5d5b1c6bbb7a5a4405dd79e5e5d9891d7d.zip | |
Update fix for Bug 232270 to utilize better patch from Ian Abbott.
svn path=/; revision=508
| -rw-r--r-- | trunk/ChangeLog | 4 | ||||
| -rwxr-xr-x | trunk/src/revdep-rebuild/revdep-rebuild | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 8f1956c..1fc3478 100644 --- 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 c2f3f57..3ffe904 100755 --- 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." |