Revert "emerge-webrsync: actually honour the sync-webrsync-verify-sig…

…nature attribute" This reverts commit f99eb91. Revert for now as we understand the status quo better, and this breaks syncing w/ emerge-webrsync. I'll come back to this but I'd rather work with a known quantity for now than rush a fix. Bug: https://bugs.gentoo.org/940120 Signed-off-by: Sam James <[email protected]>
gentoo · Oct 2, 2024 · 123a7be · 123a7be
1 parent 376ab2c
commit 123a7be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
@@ -105,17 +105,16 @@ do_debug=0
 keep=false
 
 handle_pgp_setup() {
-	local attr repo_has_webrsync_verify webrsync_gpg
-
 	# WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification
 	# WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg
 	# WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg"
 	WEBRSYNC_VERIFY_SIGNATURE=1
 
-	has webrsync-gpg ${FEATURES} && webrsync_gpg=1
+	has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0
 
-	attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature)
-	[[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1
+	repo_has_webrsync_verify=$(
+		has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature	| LC_ALL=C tr '[:upper:]' '[:lower:]') true yes
+	)
 
 	if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then
 		# If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync

diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
@@ -165,17 +165,16 @@ if [[ ! -d $STATE_DIR ]]; then
 fi
 
 handle_pgp_setup() {
-	local attr repo_has_webrsync_verify webrsync_gpg
-
 	# WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification
 	# WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg
 	# WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg"
 	WEBRSYNC_VERIFY_SIGNATURE=1
 
-	has webrsync-gpg ${FEATURES} && webrsync_gpg=1
+	has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0
 
-	attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature)
-	[[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1
+	repo_has_webrsync_verify=$(
+		has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature	| LC_ALL=C tr '[:upper:]' '[:lower:]') true yes
+	)
 
 	if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then
 		# If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync