From: fuzzyray <fuzzyray@gentoo.org>
Date: Thu, 23 Sep 2010 03:36:39 +0000 (-0000)
Subject: Don't match package names in /var/db/pkg that begin with a '-'. This
X-Git-Tag: gentoolkit-0.3.0_rc11~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef5ade79e7b8bd273dda14c54acfcf6ea1608c52;p=gentoolkit.git

Don't match package names in /var/db/pkg that begin with a '-'. This
prevents us from matching -MERGING entries. (Bug 338031)

svn path=/trunk/gentoolkit/; revision=814
---

diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild
index 4387410..e034124 100755
--- a/bin/revdep-rebuild
+++ b/bin/revdep-rebuild
@@ -288,9 +288,11 @@ get_file_owner() {
 	# Add a space to the end of each object name to prevent false
 	# matches, for example /usr/bin/dia matching /usr/bin/dialog (bug #196460).
 	# The same for "${rpath} ".
+	# Don't match an entry with a '-' at the start of the package name. This
+	# prevents us from matching invalid -MERGING entries. (bug #338031)
 	find -L /var/db/pkg -type f -name CONTENTS -print0 |
 		xargs -0 grep -m 1 -Fl -e "${*} " -e "${rpath} " -e "${mlib} " |
-		sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:'
+		sed 's:/var/db/pkg/\(.*\)/\([^-].*\)/CONTENTS:\1/\2:'
 }
 ##
 # Normalize some EMERGE_OPTIONS