diff options
| author | Allan McRae <allan@archlinux.org> | 2012-08-11 10:56:17 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-09-18 15:38:08 +0200 |
| commit | 85506809248c205f763df685fa5bda5c21c06eae (patch) | |
| tree | 58fcf7f48579a04f2a208a1bf79e036640b7b8b0 | |
| parent | aa50df630c0ca572ff14e938b180ae46040f14a3 (diff) | |
| download | pacman-85506809248c205f763df685fa5bda5c21c06eae.tar.gz pacman-85506809248c205f763df685fa5bda5c21c06eae.tar.xz | |
makepkg: fix warnings with --noextract
Three warnings after someone deliberately typed --noextract is a
tad excessive... Also, an empty $srcdir is perfectly valid when
the source array is empty, although using --noextact then is
wasteful.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 262bcf89..270f9888 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2699,15 +2699,7 @@ chmod a-s "$srcdir" cd_safe "$srcdir" if (( NOEXTRACT )); then - warning "$(gettext "Skipping source retrieval -- using existing %s tree")" "src/" - warning "$(gettext "Skipping source integrity checks -- using existing %s tree")" "src/" - warning "$(gettext "Skipping source extraction -- using existing %s tree")" "src/" - - if (( NOEXTRACT )) && dir_is_empty "$srcdir"; then - error "$(gettext "The source directory is empty, there is nothing to build!")" - plain "$(gettext "Aborting...")" - exit 1 - fi + warning "$(gettext "Using existing %s tree")" "src/" elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ && { [[ ! -d $pkgdir ]] || dir_is_empty "$pkgdir"; }; then |