[patch] Jason's patch from comment 5 in git format

proposed_patch_573920c5.patch (text/plain), 1.30 KB, created by Thomas Deutschmann (RETIRED) on 2016-03-07 20:52:30 UTC

From a6dc2d5aca647d0b431dfcf38b9e74452ff7f2c4 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <[e-mail]>
Date: Mon, 7 Mar 2016 23:57:22 +0100
Subject: [PATCH] bin/phase-helpers.sh: Don't die on eapply_user when patch dir
 is empty (#573920)

Bug: https://bugs.gentoo.org/show_bug.cgi?id=573920
---
 bin/phase-helpers.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 80f5946..60e51ea 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1089,6 +1089,10 @@ if ___eapi_has_eapply_user; then
 		local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
 
 		local d applied
+		local LC_ALL=POSIX
+		local prev_shopt=$(shopt -p nullglob)
+		shopt -s nullglob
+
 		# possibilities:
 		# 1. ${CATEGORY}/${P}-${PR} (note: -r0 desired to avoid applying
 		#    ${P} twice)
@@ -1096,12 +1100,14 @@ if ___eapi_has_eapply_user; then
 		# 3. ${CATEGORY}/${PN}
 		# all of the above may be optionally followed by a slot
 		for d in "${basedir}"/${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do
-			if [[ -d ${d} ]]; then
+			if [[ -n $(echo ${d}/*.diff) || -n $(echo ${d}/*.patch) ]]; then
 				eapply "${d}"
 				applied=1
 			fi
 		done
 
+		${prev_shopt}
+
 		[[ -n ${applied} ]] && ewarn "User patches applied."
 	}
 fi
-- 
2.7.2