makepkg: rework --skipinteg

The current --skipinteg is a bit weird.  It does not skip integrity
checks, but instead does them and prints a warning. Change this
behaviour to actually skipping the checks.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 8 insertions, 9 deletions

diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 1c70a35d..a2fdb3f3 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -88,8 +88,7 @@ Options
 	using "`makepkg -g >> PKGBUILD`".
 
 *--skipinteg*::
-	Do not fail when the PKGBUILD does not contain any integrity checks, just
-	print a warning instead.
+	Do not perform any integrity checks, just print a warning instead.
 
 *-h, \--help*::
 	Output syntax and command line options.
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index dbb1a1e7..e8aaa8b7 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -636,12 +636,8 @@ check_checksums() {
 	done
 
 	if (( ! correlation )); then
-		if (( SKIPINTEG )); then
-			warning "$(gettext "Integrity checks are missing.")"
-		else
-			error "$(gettext "Integrity checks are missing.")"
-			exit 1 # TODO: error code
-		fi
+		error "$(gettext "Integrity checks are missing.")"
+		exit 1 # TODO: error code
 	fi
 }
 
@@ -1970,7 +1966,11 @@ elif (( REPKG )); then
 	fi
 else
 	download_sources
-	check_checksums
+	if (( ! SKIPINTEG )); then
+		check_checksums
+	else
+		warning "$(gettext "Skipping integrity checks.")"
+	fi
 	extract_sources
 fi