Update revdep-rebuild to use extended regular expressions instead of basic regular...

svn path=/branches/gentoolkit-0.2.4/; revision=740

diff --git a/ChangeLog b/ChangeLog
index 378b6f6ba7b1a76242b2d82ad6fe3df9648babbf..0c2cffac3347bb60a04a75a2db52df69e33928d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-05: Paul Varner <fuzzyray@gentoo.org>
+       * revdep-rebuild: Update revdep-rebuild to use extended regular
+       expressions instead of basic regular expressions. (Bug 143498)
+
 2010-02-04: Paul Varner <fuzzyray@gentoo.org>
        * revdep-rebuild: Fix revdep-rebuild to handle include statements in
        /etc/ld.so.conf. (Bug 298651)

diff --git a/src/revdep-rebuild/revdep-rebuild b/src/revdep-rebuild/revdep-rebuild
index d694bc956fb98b7c3e527ba8131d19059d214959..ec53e751b7452d3aebd8914f03d42ccda49f87ea 100755 (executable)
--- a/src/revdep-rebuild/revdep-rebuild
+++ b/src/revdep-rebuild/revdep-rebuild
@@ -705,10 +705,10 @@ main_checks() {
                                ldd_status=$? # TODO: Check this for problems with sort
                                # HACK: if LD_LIBRARY_MASK is null or undefined grep -vF doesn't work
                                if grep -vF "${LD_LIBRARY_MASK:=$'\a'}" <<< "$ldd_output" |
-                                       grep -q "$SONAME_SEARCH"; then
+                                       grep -q -E "$SONAME_SEARCH"; then
                                        if [[ $SEARCH_BROKEN && $FULL_LD_PATH ]]; then
                                                if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" ldd "$target_file" 2>/dev/null |
-                                                       grep -vF "$LD_LIBRARY_MASK" | grep -q "$SONAME_SEARCH"; then
+                                                       grep -vF "$LD_LIBRARY_MASK" | grep -q -E "$SONAME_SEARCH"; then
                                                        # FIXME: I hate duplicating code
                                                        # Only build missing direct dependencies
                                                        MISSING_LIBS=$(