From: fuzzyray <fuzzyray@gentoo.org>
Date: Fri, 14 Sep 2007 17:52:12 +0000 (-0000)
Subject: Fix revdep-rebuild to ignore libraries in LD_LIBRARY_MASK, when checking for "no... 
X-Git-Tag: gentoolkit-0.2.4.3~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3df65bfb794805d311125660c74adfdce0ea9101;p=gentoolkit.git

Fix revdep-rebuild to ignore libraries in LD_LIBRARY_MASK, when checking for "no version information available" errors (Bug #182882)

svn path=/; revision=439
---

diff --git a/trunk/src/revdep-rebuild/revdep-rebuild-rewrite b/trunk/src/revdep-rebuild/revdep-rebuild-rewrite
index 6d622e2..947234c 100755
--- a/trunk/src/revdep-rebuild/revdep-rebuild-rewrite
+++ b/trunk/src/revdep-rebuild/revdep-rebuild-rewrite
@@ -208,6 +208,7 @@ get_args() {
 			;;
 		-P|--no-progress)
 			progress() { :; }
+			;;
 		-q|--quiet)
 			echo_v() { :; }
 			progress() { :; }
@@ -583,15 +584,19 @@ main_checks() {
 		done
 		if [[ $SEARCH_BROKEN ]]; then
 			# Look for missing version
-			for target_file in $(
-				awk '/no version information available/{
+			while read target_file; do
+				echo "obj $target_file" >> "$LIST.3_rebuild"
+				echo_v "  broken $target_file (no version information available)"
+			done < <(
+				awk -v ldmask="($LD_LIBRARY_MASK)" '
+					BEGIN{ gsub(/\n/, "|", ldmask) }
+					/no version information available/{
 					gsub("[()]", "", $NF);
+						if (seen[$NF]++)  next;
+						if ($NF ~ ldmask) next;
 					print $NF
-				}' "$LIST.3_ldd_errors" | sort -u
+					}' "$LIST.3_ldd_errors"
 			); do
-				echo "obj $target_file" >> "$LIST.3_rebuild"
-				echo_v "  broken $target_file (no version information available)"
-			done
 		fi
 		[[ -r $LIST.3_rebuild && -s $LIST.3_rebuild ]] || clean_exit
 		einfo "Generated new $LIST.3_rebuild"