From 4b38f2004a950438968fef398c08c775a11b2983 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 25 Mar 2013 21:25:47 +0100
Subject: [PATCH] readline: do not use && || conditionals in do_funcs; breaks
 trap ERR.

---
 srcpkgs/readline/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template
index d20dfa0c37..28196c0455 100644
--- a/srcpkgs/readline/template
+++ b/srcpkgs/readline/template
@@ -23,16 +23,18 @@ pre_configure() {
 
 	if [ "${_patch_ver}" -gt 000 ]; then
 		for p in $(seq -w 001 ${_patch_ver}); do
-			cd ${XBPS_SRCDISTDIR} || return 1
-			[ -f ${XBPS_SRCDISTDIR}/readline62-${p} ] && continue
+			cd ${XBPS_SRCDISTDIR}
+			if [ -f ${XBPS_SRCDISTDIR}/readline62-${p} ]; then
+				continue
+			fi
 			msg_normal " Fetching $url/readline62-$p ...\n"
 			$XBPS_FETCH_CMD ${url}/readline62-$p
 		done
 	fi
 	cd ${wrksrc}
 	for p in $(seq -w 001 ${_patch_ver}); do
-		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/readline62-${p} && \
-			msg_normal " Applying patch readline62-$p.\n"
+		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/readline62-${p}
+		msg_normal " Applying patch readline62-$p.\n"
 	done
 	sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
 }