| 1 |
Author: fuzzyray |
| 2 |
Date: 2010-03-01 19:21:30 +0000 (Mon, 01 Mar 2010) |
| 3 |
New Revision: 747 |
| 4 |
|
| 5 |
Modified: |
| 6 |
branches/gentoolkit-0.2.4/src/revdep-rebuild/revdep-rebuild |
| 7 |
trunk/gentoolkit/bin/revdep-rebuild |
| 8 |
Log: |
| 9 |
Fix extended regular expression support in revdep-rebuild |
| 10 |
|
| 11 |
Modified: branches/gentoolkit-0.2.4/src/revdep-rebuild/revdep-rebuild |
| 12 |
=================================================================== |
| 13 |
--- branches/gentoolkit-0.2.4/src/revdep-rebuild/revdep-rebuild 2010-03-01 19:20:32 UTC (rev 746) |
| 14 |
+++ branches/gentoolkit-0.2.4/src/revdep-rebuild/revdep-rebuild 2010-03-01 19:21:30 UTC (rev 747) |
| 15 |
@@ -18,7 +18,7 @@ |
| 16 |
|
| 17 |
# Readonly variables: |
| 18 |
declare -r APP_NAME="${0##*/}" # The name of this application |
| 19 |
-declare -r VERSION="svn" |
| 20 |
+declare -r VERSION="genscripts-r230" |
| 21 |
declare -r OIFS="$IFS" # Save the IFS |
| 22 |
declare -r ENV_FILE=0_env.rr # Contains environment variables |
| 23 |
declare -r FILES_FILE=1_files.rr # Contains a list of files to search |
| 24 |
@@ -757,8 +757,8 @@ |
| 25 |
# FIXME: I hate duplicating code |
| 26 |
# Only rebuild for direct dependencies |
| 27 |
MISSING_LIBS=$( |
| 28 |
- expr="/$SONAME_SEARCH/s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p" |
| 29 |
- sort -u <<< "$ldd_output" | sed -n "$expr" |
| 30 |
+ expr="s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p" |
| 31 |
+ sort -u <<< "$ldd_output" | grep -E "$SONAME | sed -n "$expr" |
| 32 |
) |
| 33 |
REQUIRED_LIBS=$( |
| 34 |
expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p'; |
| 35 |
|
| 36 |
Modified: trunk/gentoolkit/bin/revdep-rebuild |
| 37 |
=================================================================== |
| 38 |
--- trunk/gentoolkit/bin/revdep-rebuild 2010-03-01 19:20:32 UTC (rev 746) |
| 39 |
+++ trunk/gentoolkit/bin/revdep-rebuild 2010-03-01 19:21:30 UTC (rev 747) |
| 40 |
@@ -18,7 +18,7 @@ |
| 41 |
|
| 42 |
# Readonly variables: |
| 43 |
declare -r APP_NAME="${0##*/}" # The name of this application |
| 44 |
-declare -r VERSION="svn" |
| 45 |
+declare -r VERSION="genscripts-r230" |
| 46 |
declare -r OIFS="$IFS" # Save the IFS |
| 47 |
declare -r ENV_FILE=0_env.rr # Contains environment variables |
| 48 |
declare -r FILES_FILE=1_files.rr # Contains a list of files to search |
| 49 |
@@ -757,8 +757,8 @@ |
| 50 |
# FIXME: I hate duplicating code |
| 51 |
# Only rebuild for direct dependencies |
| 52 |
MISSING_LIBS=$( |
| 53 |
- expr="/$SONAME_SEARCH/s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p" |
| 54 |
- sort -u <<< "$ldd_output" | sed -n "$expr" |
| 55 |
+ expr="s/^[[:space:]]*\([^[:space:]]*\).*$/\1/p" |
| 56 |
+ sort -u <<< "$ldd_output" | grep -E "$SONAME | sed -n "$expr" |
| 57 |
) |
| 58 |
REQUIRED_LIBS=$( |
| 59 |
expr='s/^[[:space:]]*NEEDED[[:space:]]*\([^[:space:]]*\).*/\1/p'; |
Archives