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

makepkg: skip dependency checking with --verifysource

Browse Source 
Dependencies are now handled with --nobuild unless specificially skipped.
Using --verifysource will skip dependency checks unless --syncdeps is
specified.

Fixes FS#35057 and FS#36999.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2014-06-29 23:23:09 +10:00
parent 7e87614665
commit dce82f9d19
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/makepkg.8.txt
View File

@ -63,7 +63,9 @@ Options
*\--verifysource*:: *\--verifysource*::
For each source file in the source array of PKGBUILD, download the file For each source file in the source array of PKGBUILD, download the file
if required and perform the integrity checks. No extraction or build is if required and perform the integrity checks. No extraction or build is
performed. Useful for performing subsequent offline builds. performed. Dependencies specified in the PKGBUILD will not be handled
unless `--syndeps` is used. Useful for performing subsequent offline
builds.
*-f, \--force*:: *-f, \--force*::
makepkg will not build a package if a built package already exists in makepkg will not build a package if a built package already exists in

4
scripts/makepkg.sh.in
View File

@ -2449,7 +2449,7 @@ check_vcs_software() {
local uninstalled local uninstalled
uninstalled="$(set +E; check_deps $client)" || exit 1 uninstalled="$(set +E; check_deps $client)" || exit 1
# if not installed, check presence in depends or makedepends # if not installed, check presence in depends or makedepends
if [[ -n "$uninstalled" ]] && (( ! NODEPS )); then if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then
if ! in_array "$client" ${depends[@]} ${makedepends[@]}; then if ! in_array "$client" ${depends[@]} ${makedepends[@]}; then
error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \
"$client" "${proto%%+*}" "$client" "${proto%%+*}"
@ -3132,7 +3132,7 @@ if (( SOURCEONLY )); then
exit 0 exit 0
fi fi
if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then
# no warning message needed for nobuild # no warning message needed for nobuild
if (( NODEPS )); then if (( NODEPS )); then
warning "$(gettext "Skipping dependency checks.")" warning "$(gettext "Skipping dependency checks.")"