Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 482232
Collapse All | Expand All

(-)a/bin/revdep-rebuild.sh (-6 / +7 lines)
Lines 942-948 list_skipped_packages() { Link Here
942
	ewarn
942
	ewarn
943
}
943
}
944
get_build_order() {
944
get_build_order() {
945
	local -r OLD_EMERGE_DEFAULT_OPTS="$EMERGE_DEFAULT_OPTS"
945
	local -a OLD_EMERGE_DEFAULT_OPTS=("${EMERGE_DEFAULT_OPTS[@]}")
946
	local RAW_REBUILD_LIST
946
	local RAW_REBUILD_LIST
947
	local REBUILD_GREP
947
	local REBUILD_GREP
948
	local i
948
	local i
Lines 957-963 get_build_order() { Link Here
957
		clean_trap "$ORDER_FILE"
957
		clean_trap "$ORDER_FILE"
958
		RAW_REBUILD_LIST=$(<"$EBUILDS_FILE")
958
		RAW_REBUILD_LIST=$(<"$EBUILDS_FILE")
959
		if [[ $RAW_REBUILD_LIST ]]; then
959
		if [[ $RAW_REBUILD_LIST ]]; then
960
			export EMERGE_DEFAULT_OPTS="--nospinner --pretend --oneshot --quiet"
960
			EMERGE_DEFAULT_OPTS=(--nospinner --pretend --oneshot --quiet)
961
			RAW_REBUILD_LIST=($RAW_REBUILD_LIST) # convert into array
961
			RAW_REBUILD_LIST=($RAW_REBUILD_LIST) # convert into array
962
			# If PACKAGE_NAMES is defined we're using slots, not versions
962
			# If PACKAGE_NAMES is defined we're using slots, not versions
963
			if [[ $PACKAGE_NAMES ]]; then
963
			if [[ $PACKAGE_NAMES ]]; then
Lines 1010-1016 get_build_order() { Link Here
1010
			else
1010
			else
1011
				echo "$RAW_REBUILD_LIST" > "$ORDER_FILE"
1011
				echo "$RAW_REBUILD_LIST" > "$ORDER_FILE"
1012
			fi
1012
			fi
1013
			export EMERGE_DEFAULT_OPTS="$OLD_EMERGE_DEFAULT_OPTS"
1013
			EMERGE_DEFAULT_OPTS=("${OLD_EMERGE_DEFAULT_OPTS[@]}")
1014
		else
1014
		else
1015
			einfo 'Nothing to rebuild.'
1015
			einfo 'Nothing to rebuild.'
1016
			die 1 '(The program should have already quit, so this is a minor bug.)'
1016
			die 1 '(The program should have already quit, so this is a minor bug.)'
Lines 1043-1048 portage_settings() { Link Here
1043
	eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_REBUILD_DEFAULT_OPTS)
1043
	eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_REBUILD_DEFAULT_OPTS)
1044
	export NOCOLOR
1044
	export NOCOLOR
1045
1045
1046
	# Convert quoted paths to array.
1047
	eval "EMERGE_DEFAULT_OPTS=(${EMERGE_DEFAULT_OPTS})"
1046
	SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS"
1048
	SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS"
1047
	SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK"
1049
	SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK"
1048
	LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK"
1050
	LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK"
Lines 1142-1148 rebuild() { Link Here
1142
	trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
1144
	trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
1143
1145
1144
	[[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild'
1146
	[[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild'
1145
	echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST"
1147
	echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS[@]} ${EMERGE_OPTIONS[@]} $REBUILD_LIST"
1146
1148
1147
	is_real_merge && countdown 10
1149
	is_real_merge && countdown 10
1148
1150
Lines 1151-1157 rebuild() { Link Here
1151
1153
1152
	# Run in background to correctly handle Ctrl-C
1154
	# Run in background to correctly handle Ctrl-C
1153
	{
1155
	{
1154
		emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6
1156
		emerge --complete-graph=y --oneshot "${EMERGE_DEFAULT_OPTS[@]}" ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6
1155
		echo $? > "$STATUS_FILE"
1157
		echo $? > "$STATUS_FILE"
1156
	} &
1158
	} &
1157
	wait
1159
	wait
1158
- 

Return to bug 482232