moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

Ensure we are always in $SRCDEST before downloading

Browse Source 
When VCS sources were updated, we changed into their root directory.
Any following source was then downloaded to an incorrect place causing
a failure in makepkg.  Ensure we are always in the $SRCDEST directory
before starting any download.

Fixes FS#34488.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2013-03-27 20:11:21 +10:00
parent 3f00a03db4
commit a6291858cc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/makepkg.sh.in
View File

@ -749,12 +749,11 @@ download_sources() {
GET_VCS=0
fi
pushd "$SRCDEST" &>/dev/null
local netfile
for netfile in "${source[@]}"; do
local proto=$(get_protocol "$netfile")
pushd "$SRCDEST" &>/dev/null
local proto=$(get_protocol "$netfile")
case "$proto" in
local)
download_local "$netfile"
@ -775,9 +774,9 @@ download_sources() {
download_file "$netfile"
;;
esac
done
popd &>/dev/null
popd &>/dev/null
done
}
# Automatically update pkgver variable if a pkgver() function is provided