summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2008-02-16 21:04:19 +0000
committerfuzzyray <fuzzyray@gentoo.org>2008-02-16 21:04:19 +0000
commitc727648a04005123579911e3cddd3b9371d34dc2 (patch)
treec0e7cea2808e0a412afe774ab3f8e49a63153d64
parentc66fe877b8ae841003404fb611e703fae6a5686e (diff)
downloadgentoolkit-c727648a04005123579911e3cddd3b9371d34dc2.tar.gz
Apply patch to prevent false matches of object names. (Bug 196460)
svn path=/; revision=463
-rwxr-xr-xtrunk/src/revdep-rebuild/revdep-rebuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild
index 79699f3..7b0033d 100755
--- a/trunk/src/revdep-rebuild/revdep-rebuild
+++ b/trunk/src/revdep-rebuild/revdep-rebuild
@@ -274,8 +274,10 @@ get_args() {
else
get_file_owner() {
local IFS=$'\n'
+ # ${*/%/ } adds a space to the end of each object name to prevent false
+ # matches, for example /usr/bin/dia matching /usr/bin/dialog (bug #196460).
find -L /var/db/pkg -name CONTENTS -print0 |
- xargs -0 grep -Fl "$*" |
+ xargs -0 grep -Fl "${*/%/ }" |
sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:'
}
fi