moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

makepkg: add check to ensure we have non-URL files in build dir

Browse Source 
Pacman 3.0 printed the following message if a file could not be found:
  ERROR: xxx was not found in the build directory and is not a proper URL.

We lost this logic in 3.1 when moving to the DLAGENT type stuff, so a
not-found file got passed all the way to the download logic where it failed
with a odd error message. Bring back some logic to ensure only files with
URLs get past a certain point, and fail if the file is not available.

Fixes FS#9208.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2008-01-15 23:03:51 -06:00
parent 3b464dc897
commit 003adb7646
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/makepkg.sh.in
View File

@ -464,6 +464,12 @@ download_sources() {
continue
fi
# if we get here, check to make sure it was a URL, else fail
if [ "$file" = "$netfile" ]; then
error "$(gettext "%s was not found in the build directory and is not a URL.")" "$netfile"
exit 1 # $E_MISSING_FILE
fi
# find the client we should use for this URL
local dlclient=$(get_downloadclient $netfile) || exit $?