[Dev] [dbscripts] [PATCH 2/6] Get rid of config:REQUIRE_SIGNATURE -- always require a signature

[Luke Shumaker]

From: Luke Shumaker <lukeshu at parabola.nu>

---
 config               |  2 --
 db-functions         |  4 ++--
 db-update            |  2 +-
 test/lib/common.bash | 31 +++++++++++--------------------
 4 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/config b/config
index a8a5a0f..9e3dc6b 100644
--- a/config
+++ b/config
@@ -27,8 +27,6 @@ SOURCE_CLEANUP_DRYRUN=true
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP=30
 
-REQUIRE_SIGNATURE=true
-
 LOCK_DELAY=10
 
 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging"
diff --git a/db-functions b/db-functions
index 2822b48..2629b85 100644
--- a/db-functions
+++ b/db-functions
@@ -257,7 +257,7 @@ getpkgfile() {
 	elif [ ! -f "${1}" ]; then
 		error "Package %s not found!" "$1"
 		exit 1
-	elif "${REQUIRE_SIGNATURE}" && [ ! -f "${1}.sig" ]; then
+	elif [ ! -f "${1}.sig" ]; then
 		error "Package signature %s not found!" "$1.sig"
 		exit 1
 	fi
@@ -276,7 +276,7 @@ getpkgfiles() {
 		if  [ ! -f "${f}" ]; then
 			error "Package %s not found!" "$f"
 			exit 1
-		elif "${REQUIRE_SIGNATURE}" && [ ! -f "${f}.sig" ]; then
+		elif [ ! -f "${f}.sig" ]; then
 			error "Package signature %s not found!" "$f.sig"
 			exit 1
 		fi
diff --git a/db-update b/db-update
index e91d3e4..4e2da33 100755
--- a/db-update
+++ b/db-update
@@ -43,7 +43,7 @@ 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
+			if ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
 				die "Package %s does not have a valid signature" "$repo/${pkg##*/}"
 			fi
 			if ! check_pkgrepos "${pkg}"; then
diff --git a/test/lib/common.bash b/test/lib/common.bash
index 9aa7336..ce41ae1 100644
--- a/test/lib/common.bash
+++ b/test/lib/common.bash
@@ -70,7 +70,6 @@ setup() {
 	TMPDIR="${TMP}/tmp"
 	CLEANUP_DRYRUN=false
 	SOURCE_CLEANUP_DRYRUN=false
-	REQUIRE_SIGNATURE=true
 eot
 	. config
 
@@ -145,13 +144,11 @@ releasePackage() {
 	cp *-"${pkgver}-${arch}"${PKGEXT} "${STAGING}/${repo}/"
 	popd >/dev/null
 
-	if "${REQUIRE_SIGNATURE}"; then
-		for a in "${arch[@]}"; do
-			for p in "${pkgname[@]}"; do
-				signpkg "${STAGING}/${repo}/${p}-${pkgver}-${a}"${PKGEXT}
-			done
+	for a in "${arch[@]}"; do
+		for p in "${pkgname[@]}"; do
+			signpkg "${STAGING}/${repo}/${p}-${pkgver}-${a}"${PKGEXT}
 		done
-	fi
+	done
 }
 
 getPackageNamesFromPackageBase() {
@@ -167,18 +164,14 @@ checkAnyPackageDB() {
 	local db
 
 	[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}" ]
-	if "${REQUIRE_SIGNATURE}"; then
-		[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ]
-	fi
+	[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ]
 
 	for arch in "${ARCH_BUILD[@]}"; do
 		[ -L "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ]
 		[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkg}")" ]
 
-		if "${REQUIRE_SIGNATURE}"; then
-			[ -L "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig" ]
-			[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkg}.sig")" ]
-		fi
+		[ -L "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig" ]
+		[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkg}.sig")" ]
 
 		for db in "${DBEXT}" "${FILESEXT}"; do
 			if [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" ]; then
@@ -213,13 +206,11 @@ checkPackageDB() {
 
 	[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkg}")" ]
 
-	if "${REQUIRE_SIGNATURE}"; then
-		[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ]
-		[ -L "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig" ]
-		[ ! -r "${STAGING}/${repo}/${pkg}.sig" ]
+	[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ]
+	[ -L "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig" ]
+	[ ! -r "${STAGING}/${repo}/${pkg}.sig" ]
 
-		[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkg}.sig")" ]
-	fi
+	[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}.sig")" == "$(readlink -e "${FTP_BASE}/${PKGPOOL}/${pkg}.sig")" ]
 
 	for db in "${DBEXT}" "${FILESEXT}"; do
 		if [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" ]; then
-- 
2.16.2