summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2006-03-21 15:33:35 +0000
committerfuzzyray <fuzzyray@gentoo.org>2006-03-21 15:33:35 +0000
commit685df3190fff141b1b6ca8c154b3c5ad1138efdd (patch)
tree0aed5be351de9c1090fea4ec6f3403cd482d0ce3
parent478ecb218807fe31fa270a7e1db32abacde37bab (diff)
downloadgentoolkit-685df3190fff141b1b6ca8c154b3c5ad1138efdd.tar.gz
Fix to clear environment before portageq call. Bug 126038)
svn path=/; revision=286
-rwxr-xr-xtrunk/src/revdep-rebuild/revdep-rebuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index 67760ab..6151445 100755
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -72,9 +72,9 @@ PORTAGE_ROOT=$(portageq envvar ROOT)
# Read the incremental variables from environment and portage
# Until such time as portage supports these variables as incrementals
# The value will be what is in /etc/make.conf
-PRELIMINARY_SEARCH_DIRS="$SEARCH_DIRS $(portageq envvar SEARCH_DIRS)"
-PRELIMINARY_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK $(portageq envvar SEARCH_DIRS_MASK)"
-PRELIMINARY_LD_LIBRARY_MASK="$LD_LIBRARY_MASK $(portageq envvar LD_LIBRARY_MASK)"
+PRELIMINARY_SEARCH_DIRS="$SEARCH_DIRS $(unset SEARCH_DIRS; portageq envvar SEARCH_DIRS)"
+PRELIMINARY_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK $(unset SEARCH_DIRS_MASK; portageq envvar SEARCH_DIRS_MASK)"
+PRELIMINARY_LD_LIBRARY_MASK="$LD_LIBRARY_MASK $(unset LD_LIBRARY_MASK; portageq envvar LD_LIBRARY_MASK)"
# Add the defaults
if [ -d /etc/revdep-rebuild ]