summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Wallace <danielwallace@gtmanfred.com>2013-03-31 23:49:16 +0200
committerAllan McRae <allan@archlinux.org>2013-04-01 07:53:12 +0200
commit8d3ee29809d696bf75b5dd08f73663c0627632ba (patch)
tree4d0a1a2da4e2a9cc40107348fea35a13ecc4a017
parentafc77a808db7927866afab4951b80a8e09846d8a (diff)
downloadpacman-8d3ee29809d696bf75b5dd08f73663c0627632ba.tar.gz
pacman-8d3ee29809d696bf75b5dd08f73663c0627632ba.tar.xz
remove continue from download_local
Bug exposed 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 Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6c898497..da620a45 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"