aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2010-02-05 20:57:56 +0000
committerfuzzyray <fuzzyray@gentoo.org>2010-02-05 20:57:56 +0000
commitc840d3c399fec1467c737239824c46476d2cb669 (patch)
treea2006dfa52da6c46b57af8096d594acc9399d3ce
parentFix revdep-rebuild to parse include statements in /etc/ld.so.conf (Bug 298651... (diff)
downloadgentoolkit-c840d3c399fec1467c737239824c46476d2cb669.tar.gz
gentoolkit-c840d3c399fec1467c737239824c46476d2cb669.tar.bz2
gentoolkit-c840d3c399fec1467c737239824c46476d2cb669.zip
Update revdep-rebuild to use extended regular expressions instead of basic regular expressions. (Bug 143498)
svn path=/branches/gentoolkit-0.2.4/; revision=740
-rw-r--r--ChangeLog4
-rwxr-xr-xsrc/revdep-rebuild/revdep-rebuild4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 378b6f6..0c2cffa 100644
--- 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 d694bc9..ec53e75 100755
--- 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=$(