From cec98c63189b98cc854c6c379cd6925a495555f4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 25 May 2015 01:44:39 -0600
Subject: Backport simple changes from the lukeshu/xbs branch.

---
 db-update | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'db-update')

diff --git a/db-update b/db-update
index 4830791..559ef3f 100755
--- a/db-update
+++ b/db-update
@@ -42,14 +42,22 @@ for repo in "${repos[@]}"; do
 			if ! check_pkgfile "${pkg}"; then
 				die "Package %s is not consistent with its meta data" "${repo}/${pkg##*/}"
 			fi
+			if "${REQUIRE_SIGNATURE}" && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
+				die "Package %s does not have a valid signature" "${repo}/${pkg##*/}"
+			fi
+			if ! check_pkgxbs "${pkg}" "${repo}"; then
+				die "Package %s is not consistent with %s" "${repo}/${pkg##*/}" "$(xbs name)"
+			fi
 			if ! check_pkgrepos "${pkg}"; then
 				die "Package %s already exists in another repository" "${repo}/${pkg##*/}"
 			fi
+			if ! check_packager "${pkg}"; then
+				die "Package ${repo}/${pkg##*/} does not have a valid packager"
+			fi
 		done
-		# This is fucking obnoxious
-		#if ! check_splitpkgs ${repo} "${pkgs[@]}"; then
-		#	die "Missing split packages for %s" "${repo}"
-		#fi
+		if ! check_splitpkgs "${repo}" "${pkgs[@]}"; then
+			die "Missing split packages for %s" "${repo}"
+		fi
 	else
 		die "Could not read %s" "${STAGING}"
 	fi
-- 
cgit v1.2.3-2-g168b