[pacman-dev] [PATCH] makepkg: always look for sources in source=()

Dave Reisner dreisner at archlinux.org
Sat Oct 18 12:27:07 UTC 2014


This regression snuck in during some reviewing of 963f7fe02fcb14
(arch-specific sources). We must always check the source=() array for
sources.
---
 scripts/makepkg.sh.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 8a67d94..86f8a77 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1309,6 +1309,8 @@ verify_integrity_sums() {
 have_sources() {
 	local a
 
+	(( ${#source[*]} )) && return 0
+
 	case $1 in
 		all)
 			for a in "${arch[@]}"; do
@@ -1316,9 +1318,7 @@ have_sources() {
 			done
 			;;
 		*)
-			if (( ${#source[*]} )) || array_build _ source_"$CARCH"; then
-				return 0
-			fi
+			array_build _ source_"$CARCH" && return 0
 			;;
 	esac
 
-- 
2.1.2


More information about the pacman-dev mailing list