[gentoo-commits] proj/portage:master commit in: bin/, misc/

[gentoo-commits] proj/portage:master commit in: bin/, misc/

[Ulrich Müller]

commit:     26bd466e1620c26adbfc78195a8f35475b49d57a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 06:48:42 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 06:48:42 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=26bd466e

emerge-webrsync: Avoid double slash when expanding EPREFIX

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 bin/emerge-webrsync        | 6 +++---
 misc/emerge-delta-webrsync | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 782a6052eb..99da05543a 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -25,7 +25,7 @@
 #
 
 # Opportunistically use gentoo-functions for nicer output
-functions_script="${EPREFIX:-/}/lib/gentoo/functions.sh"
+functions_script="${EPREFIX}/lib/gentoo/functions.sh"
 source "${functions_script}" || {
 	echo "${argv0}: Could not source ${functions_script}!" 1>&2
 
@@ -272,7 +272,7 @@ check_file_signature_gemato() {
 		if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
 			local key="${PORTAGE_GPG_KEY}"
 		else
-			local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+			local key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
 		fi
 
 		if [[ ! -f "${key}" ]] ; then
@@ -319,7 +319,7 @@ check_file_signature_gpg_unwrapped() {
 		if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
 			local key="${PORTAGE_GPG_KEY}"
 		else
-			local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+			local key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
 		fi
 
 		if [[ ! -f "${key}" ]] ; then

diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 610a03f8f7..12930a0a68 100755
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -20,7 +20,7 @@
 #
 
 # Opportunistically use gentoo-functions for nicer output
-functions_script="${EPREFIX:-/}/lib/gentoo/functions.sh"
+functions_script="${EPREFIX}/lib/gentoo/functions.sh"
 source "${functions_script}" || {
 	echo "${argv0}: Could not source ${functions_script}!" 1>&2
 
@@ -383,7 +383,7 @@ check_file_signature_gemato() {
 		if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
 			local key="${PORTAGE_GPG_KEY}"
 		else
-			local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+			local key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
 		fi
 
 		if [[ ! -f "${key}" ]] ; then
@@ -430,7 +430,7 @@ check_file_signature_gpg_unwrapped() {
 		if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
 			local key="${PORTAGE_GPG_KEY}"
 		else
-			local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+			local key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
 		fi
 
 		if [[ ! -f "${key}" ]] ; then

[gentoo-commits] proj/portage:master commit in: bin/, misc/

[Sam James]

commit:     123a7be533161b14cacc4aa98708fbf1027ecce1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 05:02:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 05:05:43 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=123a7be5

Revert "emerge-webrsync: actually honour the sync-webrsync-verify-signature attribute"

This reverts commit f99eb91227918d5bf0cc531e78bd597c73b7ce1f.

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 <sam <AT> gentoo.org>

 bin/emerge-webrsync        | 9 ++++-----
 misc/emerge-delta-webrsync | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 124bcaddcf..caa4986da2 100755
--- 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
index 8550c15fe0..a788cdb0eb 100755
--- 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