diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2010-09-23 03:36:39 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2010-09-23 03:36:39 +0000 |
| commit | ef5ade79e7b8bd273dda14c54acfcf6ea1608c52 (patch) | |
| tree | e6620125ceaef3a92f3397fc30fed699f09f83c6 /bin/revdep-rebuild | |
| parent | e43337a9b05b3a5c39a1b2ca988375f2b7e352d3 (diff) | |
| download | gentoolkit-ef5ade79e7b8bd273dda14c54acfcf6ea1608c52.tar.gz | |
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
Diffstat (limited to 'bin/revdep-rebuild')
| -rwxr-xr-x | bin/revdep-rebuild | 4 |
1 files changed, 3 insertions, 1 deletions
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 |