Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 38751 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-10 / +7 lines)
Line  Link Here
0
-- /usr/bin/revdep-rebuild
0
++ revdep-rebuild
Lines 185-195 Link Here
185
		if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" \
185
		if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" \
186
		ldd "$FILE" 2>/dev/null | grep -v "$LD_MASK" |
186
		ldd "$FILE" 2>/dev/null | grep -v "$LD_MASK" |
187
			$SONAME_GREP -q "$SONAME_SEARCH" ; then
187
			$SONAME_GREP -q "$SONAME_SEARCH" ; then
188
			echo "$FILE" >>$LLIST.3_rebuild
188
			echo "obj $FILE " >>$LLIST.3_rebuild
189
			echo_v "  broken $FILE (requires $(ldd "$FILE" | sed -n 's/	\(.*\) => not found$/\1/p' | tr '\n' ' ' | sed 's/ $//' ))"
189
			echo_v "  broken $FILE (requires $(ldd "$FILE" | sed -n 's/	\(.*\) => not found$/\1/p' | tr '\n' ' ' | sed 's/ $//' ))"
190
		fi
190
		fi
191
		else
191
		else
192
		echo "$FILE" >>$LLIST.3_rebuild
192
		echo "obj $FILE " >>$LLIST.3_rebuild
193
		echo_v "  found $FILE"
193
		echo_v "  found $FILE"
194
		fi
194
		fi
195
	fi
195
	fi
Lines 208-215 Link Here
208
		set_trap "$LLIST.4_packages_raw"
208
		set_trap "$LLIST.4_packages_raw"
209
		echo -n >$LLIST.4_packages_raw
209
		echo -n >$LLIST.4_packages_raw
210
		echo -n >$LLIST.4_package_owners
210
		echo -n >$LLIST.4_package_owners
211
		cat $LLIST.3_rebuild | while read FILE ; do
211
		cat $LLIST.3_rebuild | while read obj FILE ; do
212
			PKG=$(fgrep -l $FILE /var/db/pkg/*/*/CONTENTS|sed -e 's:/var/db/pkg/\(.*\)/CONTENTS:\1:g' -e "s:-r[0-9]\+$::" -e "s:-[0-9][^-]*$::")
212
			PKG=$(find /var/db/pkg -name CONTENTS | xargs fgrep -l $FILE | sed -e 's:/var/db/pkg/\(.*\)/CONTENTS:\1:g' -e "s:-r[0-9]\+$::" -e "s:-[0-9][^-]*$::")
213
			if [ -z "$PKG" ] ; then
213
			if [ -z "$PKG" ] ; then
214
				echo -n -e "\n  ${RD}*** $FILE not owned by any package is broken! ***${NO}"
214
				echo -n -e "\n  ${RD}*** $FILE not owned by any package is broken! ***${NO}"
215
				echo "$FILE -> (none)" >> $LLIST.4_package_owners
215
				echo "$FILE -> (none)" >> $LLIST.4_package_owners
Lines 246-256 Link Here
246
	else
246
	else
247
		if [ -s "$LLIST.3_rebuild" ] ; then
247
		if [ -s "$LLIST.3_rebuild" ] ; then
248
			set_trap "$LLIST.4_ebuilds"
248
			set_trap "$LLIST.4_ebuilds"
249
			cat $LLIST.3_rebuild | sed 's/^/obj /;s/$/ /' |
249
			find /var/db/pkg -name CONTENTS | xargs fgrep -l -f $LLIST.3_rebuild |
250
			(
250
			sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:' > $LLIST.4_ebuilds
251
				cd /var/db/pkg
252
				fgrep -l -f - */*/CONTENTS
253
			) | sed s:/CONTENTS:: > $LLIST.4_ebuilds
254
			echo -e " done.\n  ($LLIST.4_ebuilds)"
251
			echo -e " done.\n  ($LLIST.4_ebuilds)"
255
		else
252
		else
256
			echo " Nothing to rebuild"
253
			echo " Nothing to rebuild"

Return to bug 38751