[patch] revdep-rebuild patch

revdep-rebuild.128085.patch (text/plain), 3.57 KB, created by Paul Varner (RETIRED) on 2006-04-01 12:19:45 UTC

Index: revdep-rebuild
===================================================================
--- revdep-rebuild	(revision 285)
+++ revdep-rebuild	(working copy)
@@ -72,9 +72,9 @@
 # Read the incremental variables from environment and portage
 # Until such time as portage supports these variables as incrementals
 # The value will be what is in /etc/make.conf
-PRELIMINARY_SEARCH_DIRS="$SEARCH_DIRS $(portageq envvar SEARCH_DIRS)"
-PRELIMINARY_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK $(portageq envvar SEARCH_DIRS_MASK)"
-PRELIMINARY_LD_LIBRARY_MASK="$LD_LIBRARY_MASK $(portageq envvar LD_LIBRARY_MASK)"
+PRELIMINARY_SEARCH_DIRS="$SEARCH_DIRS $(unset SEARCH_DIRS; portageq envvar SEARCH_DIRS)"
+PRELIMINARY_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK $(unset SEARCH_DIRS_MASK; portageq envvar SEARCH_DIRS_MASK)"
+PRELIMINARY_LD_LIBRARY_MASK="$LD_LIBRARY_MASK $(unset LD_LIBRARY_MASK; portageq envvar LD_LIBRARY_MASK)"
 
 # Add the defaults
 if [ -d /etc/revdep-rebuild ]
@@ -502,7 +502,8 @@
 				# If SLOT is equal to 0, then just see what portage says is latest version
 				if [ "$SLOT" = "0" ]
 				then
-					portageq best_visible $PORTAGE_ROOT $PKG
+					best_visible=$(portageq best_visible $PORTAGE_ROOT $PKG)
+					[ "x" != "x$best_visible" ] && echo $best_visible
 					continue
 				fi
 				# Otherwise mask the other SLOTTED versions and check for latest
@@ -519,7 +520,8 @@
 				do
 					echo "=${PKG}-${pkg_version}" >> /etc/portage/package.mask
 				done
-				portageq best_visible $PORTAGE_ROOT $PKG
+				best_visible=$(portageq best_visible $PORTAGE_ROOT $PKG)
+				[ "x" != "x$best_visible" ] && echo $best_visible
 				if [ -f /etc/portage/package.mask.revdep-rebuild.backup ]
 				then
 					mv -f /etc/portage/package.mask.revdep-rebuild.backup /etc/portage/package.mask
@@ -564,8 +566,8 @@
 else
 	RAW_REBUILD_LIST="$(cat $LLIST.4_ebuilds | sed s/^/=/ | tr '\n' ' ')"
 	if [ ! -z "$RAW_REBUILD_LIST" ] ; then
-		REBUILD_GREP="^\\($( (EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --nodeps --quiet $RAW_REBUILD_LIST ; echo $? >$LLIST.5_status ) | sed -n 's/\./\\&/g;s/ //g;s/$/\\/;s/\[[^]]*\]//gp' | tr '\n' '|' | sed 's/|$//'))\$"
-		if [ $(cat $LLIST.5_status) -gt 0 ] ; then
+		REBUILD_GREP="^\\($( (EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --nodeps --quiet $RAW_REBUILD_LIST ; echo $? >$LLIST.5a_status ) | sed -n 's/\./\\&/g;s/ //g;s/$/\\/;s/\[[^]]*\]//gp' | tr '\n' '|' | sed 's/|$//'))\$"
+		if [ $(cat $LLIST.5a_status) -gt 0 ] ; then
 			echo ""
 			echo -e "${RD}Warning: Failed to resolve package order."
 			echo -e "Will merge in \"random\" order!${NO}"
@@ -579,7 +581,22 @@
 			done
 			ln -f $LLIST.4_ebuilds $LLIST.5_order
 		else
-			EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --emptytree --quiet $RAW_REBUILD_LIST | sed -n 's/ //g;s/^.*\]//p' | grep "$REBUILD_GREP" >$LLIST.5_order
+			(EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --emptytree --quiet $RAW_REBUILD_LIST ; echo $? >$LLIST.5b_status ) | sed -n 's/ //g;s/^.*\]//p' | grep "$REBUILD_GREP" >$LLIST.5_order
+			if [ $(cat $LLIST.5b_status) -gt 0 ] ; then
+				echo ""
+				echo -e "${RD}Warning: Failed to resolve package order."
+				echo -e "Will merge in \"random\" order!${NO}"
+				echo "Possible reasons:"
+				echo "- An ebuild is no longer in the portage tree."
+				echo "- An ebuild is masked, use /etc/portage/packages.keyword"
+				echo "  and/or /etc/portage/package.unmask to unmask it"
+				for i in . . . . . ; do
+					echo -n -e '\a.'
+					sleep 1
+				done
+				rm -f $LLIST.5_order
+				ln -f $LLIST.4_ebuilds $LLIST.5_order
+			fi
 		fi
 	else
 		echo -n "" >$LLIST.5_order