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

Collapse All | Expand All

(-)a/portage-2.2.27/bin/phase-helpers.sh (-1 / +4 lines)
Lines 987-992 if ___eapi_has_eapply; then Link Here
987
		_eapply_patch() {
987
		_eapply_patch() {
988
			local f=${1}
988
			local f=${1}
989
			local prefix=${2}
989
			local prefix=${2}
990
			local prepend=""
991
992
			type -P gpatch > /dev/null && prepend="g"
990
993
991
			started_applying=1
994
			started_applying=1
992
			ebegin "${prefix:-Applying }${f##*/}"
995
			ebegin "${prefix:-Applying }${f##*/}"
Lines 995-1001 if ___eapi_has_eapply; then Link Here
995
			# -s to silence progress output
998
			# -s to silence progress output
996
			# -g0 to guarantee no VCS interaction
999
			# -g0 to guarantee no VCS interaction
997
			# --no-backup-if-mismatch not to pollute the sources
1000
			# --no-backup-if-mismatch not to pollute the sources
998
			patch -p1 -f -s -g0 --no-backup-if-mismatch \
1001
			${prepend}patch -p1 -f -s -g0 --no-backup-if-mismatch \
999
				"${patch_options[@]}" < "${f}"
1002
				"${patch_options[@]}" < "${f}"
1000
			failed=${?}
1003
			failed=${?}
1001
			if ! eend "${failed}"; then
1004
			if ! eend "${failed}"; then

Return to bug 574626