[pacman-dev] [PATCH] remove continue from download_local

Daniel Wallace danielwallace at gtmanfred.com
Sun Mar 31 17:49:16 EDT 2013


introduced by a6291858cc1570e56204c4a1e7a68f76c4853336

popd doesn't run in the for loop in download_sources() if the continue
in download_files is executed. Causing the extract_files to extract
everything into $SRCDEST instead of $srcdir
---

may be able to remove the pushd commands from all the extract_* functions without this

 scripts/makepkg.sh.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6c89849..da620a4 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -314,7 +314,6 @@ download_local() {
 		msg2 "$(gettext "Found %s")" "${filepath##*/}"
 		rm -f "$srcdir/${filepath##*/}"
 		ln -s "$filepath" "$srcdir/"
-		continue
 	else
 		local filename=$(get_filename "$netfile")
 		error "$(gettext "%s was not found in the build directory and is not a URL.")" "$filename"
-- 
1.8.2



More information about the pacman-dev mailing list