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

Collapse All | Expand All

(-)a/bin/phase-helpers.sh (-2 / +13 lines)
Lines 1139-1144 if ___eapi_has_eapply_user; then Link Here
1139
1139
1140
		local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
1140
		local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
1141
1141
1142
		local columns=${COLUMNS:-0}
1143
		[[ ${columns} == 0 ]] && columns=$(set -- $( ( stty size </dev/tty ) 2>/dev/null || echo 24 80 ) ; echo $2)
1144
		(( columns > 0 )) || (( columns = 80 ))
1145
1142
		local applied d f
1146
		local applied d f
1143
		local -A _eapply_user_patches
1147
		local -A _eapply_user_patches
1144
		local prev_shopt=$(shopt -p nullglob)
1148
		local prev_shopt=$(shopt -p nullglob)
Lines 1170-1175 if ___eapi_has_eapply_user; then Link Here
1170
			while read -r -d '' f; do
1174
			while read -r -d '' f; do
1171
				f=${_eapply_user_patches[${f}]}
1175
				f=${_eapply_user_patches[${f}]}
1172
				if [[ -s ${f} ]]; then
1176
				if [[ -s ${f} ]]; then
1177
					if [[ -z ${applied} ]]; then
1178
						einfo "${PORTAGE_COLOR_INFO}$(for ((column = 0; column < ${columns} - 3; column++)); do echo -n =; done)${PORTAGE_COLOR_NORMAL}"
1179
						einfo "Applying user patches from ${basedir} ..."
1180
					fi
1181
1173
					eapply "${f}"
1182
					eapply "${f}"
1174
					applied=1
1183
					applied=1
1175
				fi
1184
				fi
Lines 1179-1185 if ___eapi_has_eapply_user; then Link Here
1179
1188
1180
		${prev_shopt}
1189
		${prev_shopt}
1181
1190
1182
		[[ -n ${applied} ]] && ewarn "User patches applied."
1191
		if [[ -n ${applied} ]]; then
1192
			einfo "User patches applied."
1193
			einfo "${PORTAGE_COLOR_INFO}$(for ((column = 0; column < ${columns} - 3; column++)); do echo -n =; done)${PORTAGE_COLOR_NORMAL}"
1194
		fi
1183
	}
1195
	}
1184
fi
1196
fi
1185
1197
1186
- 

Return to bug 825066