Revert fix for bug 93574 as it can cause packages to be missed. (bug 97171)

svn path=/; revision=223

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 601680bf75d035e80a12873eff7e74d7797b4138..fdcd3b1732afaa82117d5d6e8961414b6c250aac 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,6 @@
+2005-06-28 Paul Varner <fuzzyray@gentoo.org>
+       * revdep-rebuild: Revert fix for bug 93574 as it can cause packages to be missed. (bug 97171)
+
 2005-06-07 Paul Varner <fuzzyray@gentoo.org>
        * revdep-rebuild: Delete temporary files if the environment does not match the previous
                          environment (bug 95274)

diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index 37138106026b246fc660095039527655080a138c..b41fffbe767692b44697bd85f494e5fa8aa65413 100755 (executable)
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -91,7 +91,9 @@ unset SEARCH_DIRS
 for i in $(echo $PRELIMINARY_SEARCH_DIRS)
 do
        [ "$i" = "-*" ] && break
-       SEARCH_DIRS="$(echo $SEARCH_DIRS $(readlink -f $i))"
+       # Append a / at the end so that links and directories are treated the same by find
+       # Remove any existing trailing slashes to prevent double-slashes
+       SEARCH_DIRS="$(echo $SEARCH_DIRS ${i/%\//}/)"
 done
 
 unset SEARCH_DIRS_MASK