[gentoo-commits] proj/qa-scripts:master commit in: /

[Robin H. Johnson]

commit:     9700d70efd5e5a1fc5d4f6e67978871e511242f3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 03:37:46 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May  4 03:37:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=9700d70e

keyrings: workaround export bug for now

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 keyrings-export.bash               | 4 ++++
 keyrings-recv-keys.gentoo.org.bash | 4 ++++
 keyrings-recv-sks.bash             | 6 +++++-
 keyrings-send-keys.gentoo.org.bash | 4 ++++
 keyrings.inc.bash                  | 1 +
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index e2bbb14..143cda2 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -12,6 +12,10 @@ source "${BASEDIR}"/keyrings.inc.bash
 
 set -e
 export_ldap_data_to_env
+export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
+export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${NONCOMMIT_RULE}") )
+export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
+export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
 
 export_keys "${OUTPUT_DIR}"/service-keys.gpg \
        "${SYSTEM_KEYS[@]}"

diff --git a/keyrings-recv-keys.gentoo.org.bash 
b/keyrings-recv-keys.gentoo.org.bash
index ee8feeb..846d242 100755
--- a/keyrings-recv-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -10,6 +10,10 @@ source "${BASEDIR}"/keyrings.inc.bash
 
 set -e
 export_ldap_data_to_env
+export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
+export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${NONCOMMIT_RULE}") )
+export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
+export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
 
 export KEYSERVERS=( "${KS_GENTOO}" )
 export KEYSERVER_TIMEOUT=5m

diff --git a/keyrings-recv-sks.bash b/keyrings-recv-sks.bash
index c5e1d1c..4e613b8 100755
--- a/keyrings-recv-sks.bash
+++ b/keyrings-recv-sks.bash
@@ -10,8 +10,12 @@ source "${BASEDIR}"/keyrings.inc.bash
 
 set -e
 export_ldap_data_to_env
+export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
+export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${NONCOMMIT_RULE}") )
+export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
+export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
 
-export KEYSERVER=( ${KS_SKS} )
+export KEYSERVERS=( "${KS_SKS}" )
 export KEYSERVER_TIMEOUT=20m
 
 grab_keys "${SYSTEM_KEYS[@]}"

diff --git a/keyrings-send-keys.gentoo.org.bash 
b/keyrings-send-keys.gentoo.org.bash
index 7e16267..ae67acf 100755
--- a/keyrings-send-keys.gentoo.org.bash
+++ b/keyrings-send-keys.gentoo.org.bash
@@ -7,6 +7,10 @@ source "${BASEDIR}"/keyrings.inc.bash
 
 set -e
 export_ldap_data_to_env
+export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
+export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${NONCOMMIT_RULE}") )
+export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
+export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
 
 export KEYSERVERS=( "${KS_GENTOO}" )
 export KEYSERVER_TIMEOUT=5m

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index c885e8d..0c45e68 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -93,6 +93,7 @@ export_keys() {
 }
 
 # populate common variables
+# TODO: for unclear reason this does not populate correctly inside a function
 export_ldap_data_to_env() {
        export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
        export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b 
"${DEV_BASE}" "${NONCOMMIT_RULE}") )