aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2010-03-01 19:21:30 +0000
committerfuzzyray <fuzzyray@gentoo.org>2010-03-01 19:21:30 +0000
commit63e198890b14e8453e17a552e424b461b42e4dbb (patch)
treeb1e7ec57db6d62d39ac0cc842980842e2bc94ac1 /src/revdep-rebuild
parentBackport revdep-rebuild from trunk for all recent fixes. Bugs included in thi... (diff)
downloadgentoolkit-63e198890b14e8453e17a552e424b461b42e4dbb.tar.gz
gentoolkit-63e198890b14e8453e17a552e424b461b42e4dbb.tar.bz2
gentoolkit-63e198890b14e8453e17a552e424b461b42e4dbb.zip
Fix extended regular expression support in revdep-rebuild
svn path=/branches/gentoolkit-0.2.4/; revision=747
Diffstat (limited to 'src/revdep-rebuild')
-rwxr-xr-xsrc/revdep-rebuild/revdep-rebuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/revdep-rebuild/revdep-rebuild b/src/revdep-rebuild/revdep-rebuild
index 1eb4393..8b0dec0 100755
--- a/src/revdep-rebuild/revdep-rebuild
+++ b/src/revdep-rebuild/revdep-rebuild
@@ -18,7 +18,7 @@ unset GREP_OPTIONS
# Readonly variables:
declare -r APP_NAME="${0##*/}" # The name of this application
-declare -r VERSION="svn"
+declare -r VERSION="genscripts-r230"
declare -r OIFS="$IFS" # Save the IFS
declare -r ENV_FILE=0_env.rr # Contains environment variables
declare -r FILES_FILE=1_files.rr # Contains a list of files to search
@@ -757,8 +757,8 @@ main_checks() {
# FIXME: I hate duplicating code
# Only rebuild for direct dependencies
MISSING_LIBS=$(
- expr="/$SONAME_SEARCH/s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p"
- sort -u <<< "$ldd_output" | sed -n "$expr"
+ expr="s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p"
+ sort -u <<< "$ldd_output" | grep -E "$SONAME | sed -n "$expr"
)
REQUIRED_LIBS=$(
expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p';