[pacman-dev] [PATCH] makepkg: fix --allsource when remote source files do not reside in SRCDEST

[Cedric Staniewski]

When using the --allsource option, it was assumed that remote source
files reside in SRCDEST which is not necessarily always the case.

Signed-off-by: Cedric Staniewski <cedric at gmx.ca>
---
 scripts/makepkg.sh.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 24fddf6..806a325 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1074,9 +1074,10 @@ create_srcpackage() {
 		if [ -f "$netfile" ]; then
 			msg2 "$(gettext "Adding %s...")" "$netfile"
 			ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}"
-		elif [ "$SOURCEONLY" -eq 2 -a -f "$SRCDEST/$file" ]; then
+		elif [ "$SOURCEONLY" -eq 2 ] && [ -f "$file" -o -f "$SRCDEST/$file" ]; then
 			msg2 "$(gettext "Adding %s...")" "$file"
-			ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/"
+			[ ! -f "$file" ] && file="$SRCDEST/$file"
+			ln -s "$file" "${srclinks}/${pkgbase}/"
 		fi
 	done
 
-- 
1.6.5