[pacman-dev] [PATCH] makepkg: fix warnings with --noextract
Allan McRae
allan at archlinux.org
Sat Aug 11 05:31:54 EDT 2012
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 at archlinux.org>
---
scripts/makepkg.sh.in | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 262bcf8..270f988 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
--
1.7.11.4
More information about the pacman-dev
mailing list