From: fuzzyray Date: Fri, 5 Feb 2010 20:57:56 +0000 (-0000) Subject: Update revdep-rebuild to use extended regular expressions instead of basic regular... X-Git-Tag: gentoolkit-0.3.0_rc10~16 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a47dbfef50e10ad8233b47862391401964b4edb6;p=gentoolkit.git Update revdep-rebuild to use extended regular expressions instead of basic regular expressions. (Bug 143498) svn path=/trunk/gentoolkit/; revision=740 --- diff --git a/ChangeLog b/ChangeLog index a5b7be2..a1f4395 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-02-05: Paul Varner + *revdep-rebuild: Update revdep-rebuild to use extended regular + expressions instead of basic regular expressions. (Bug 143498) + 2010-02-04: Paul Varner * revdep-rebuild: Fix revdep-rebuild to handle include statements in /etc/ld.so.conf. (Bug 298651) diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild index 55093cf..f797f89 100755 --- a/bin/revdep-rebuild +++ b/bin/revdep-rebuild @@ -733,10 +733,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=$(