diff options
| author | Allan McRae <allan@archlinux.org> | 2014-06-29 23:23:09 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-08-04 14:23:58 +1000 |
| commit | dce82f9d198aed6ee1700048cd49dd3f95bdc9a7 (patch) | |
| tree | 624f37d5e24646d745061b244c5245c87764caa8 | |
| parent | 7e87614665f667cc550acab3626ab6ad655541c7 (diff) | |
| download | pacman-dce82f9d198aed6ee1700048cd49dd3f95bdc9a7.tar.xz | |
makepkg: skip dependency checking with --verifysource
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>
| -rw-r--r-- | doc/makepkg.8.txt | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 0277f54a..16bdc8a4 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -63,7 +63,9 @@ Options *\--verifysource*:: 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 - 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*:: makepkg will not build a package if a built package already exists in diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 48e19899..b2cb599a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2449,7 +2449,7 @@ check_vcs_software() { local uninstalled uninstalled="$(set +E; check_deps $client)" || exit 1 # 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 error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" @@ -3132,7 +3132,7 @@ if (( SOURCEONLY )); then exit 0 fi -if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then +if (( NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then # no warning message needed for nobuild if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" |