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

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

2024-05-20 Thread Robin H. Johnson

commit: ea651959e3713ed09ebdec3c7ef274ca0e8350a3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon May 20 18:47:16 2024 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon May 20 18:47:16 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ea651959

keyrings.inc.bash: avoid the SHA1 warning

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

 keyrings.inc.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 7c63e0d..6fe0dca 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -103,7 +103,8 @@ export_keys() {
# 'gpg --export' returns zero if there was no error with the command 
itself
# If there are no keys in the export set, then it ALSO does not write 
the destination file
# and prints 'gpg: WARNING: nothing exported' to stderr
-   if ! gpg "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export "${@}"; then
+   # --quiet is needed to avoid "Note: third-party key signatures using 
the SHA1 algorithm are rejected" "(use option "--allow-weak-key-signatures" to 
override)"
+   if ! gpg --quiet "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export 
"${@}"; then
echo "Unable to export keys to $DST: GPG returned non-zero"
exit 1
fi

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

2024-05-19 Thread Robin H. Johnson

commit: 38197eb2a9592c4de4d490fe1c6d164845773ca5
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May 19 17:28:21 2024 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun May 19 17:28:21 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=38197eb2

keyrings.inc.bash: support export options

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

 keyrings.inc.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index d2668e0..7c63e0d 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -103,7 +103,7 @@ export_keys() {
# 'gpg --export' returns zero if there was no error with the command 
itself
# If there are no keys in the export set, then it ALSO does not write 
the destination file
# and prints 'gpg: WARNING: nothing exported' to stderr
-   if ! gpg --output "$TMP" --export "${@}"; then
+   if ! gpg "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export "${@}"; then
echo "Unable to export keys to $DST: GPG returned non-zero"
exit 1
fi

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

2024-05-19 Thread Robin H. Johnson

commit: 3a1755377cb4beaa68914844e61b9a2566a6ee12
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May 19 17:28:40 2024 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun May 19 17:28:40 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=3a175537

keyrings-export.bash: test export-clean variants in new files

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

 keyrings-export.bash | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 56e4e51..42f0b08 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -56,6 +56,48 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${RETIRED_DEVS[@]}" \
 && KEYRINGS+=( all-devs )
 
+# TEMPORARY:
+# Verify export-clean vs stock export options.
+export GPG_EXPORT_OPTS=( --export-options export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/service-keys.export-clean.gpg \
+   "${SYSTEM_KEYS[@]}" \
+&& KEYRINGS+=( service-keys.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/infra-service-keys.export-clean.gpg \
+"${INFRA_SYSTEM_KEYS[@]}" \
+&& KEYRINGS+=( infra-service-keys.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/committing-devs.export-clean.gpg \
+   "${COMMITTING_DEVS[@]}" \
+&& KEYRINGS+=( committing-devs.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/active-devs.export-clean.gpg \
+   "${COMMITTING_DEVS[@]}" \
+   "${NONCOMMITTING_DEVS[@]}" \
+&& KEYRINGS+=( active-devs.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/infra-devs.export-clean.gpg \
+   "${INFRA_DEVS[@]}" \
+&& KEYRINGS+=( infra-devs.export-clean )
+
+export_keys "${OUTPUT_DIR}"/keys/retired-devs.export-clean.gpg \
+   "${RETIRED_DEVS[@]}" \
+&& KEYRINGS+=( retired-devs.export-clean )
+
+# Everybody together now
+export_keys "${OUTPUT_DIR}"/keys/all-devs.export-clean.gpg \
+   "${SYSTEM_KEYS[@]}" \
+   "${INFRA_SYSTEM_KEYS[@]}" \
+   "${COMMITTING_DEVS[@]}" \
+   "${NONCOMMITTING_DEVS[@]}" \
+   "${INFRA_DEVS[@]}" \
+   "${RETIRED_DEVS[@]}" \
+&& KEYRINGS+=( all-devs.export-clean )
+
+unset GPG_EXPORT_OPTS
+# END TEMPORARY
+
 for key in "${KEYRINGS[@]}" ; do
if [[ ! -L "${OUTPUT_DIR}"/${key}.gpg ]] ; then
# Compatibility symlink

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

2024-05-19 Thread Robin H. Johnson

commit: 4eb498510530c9717576144ce80800310f070e35
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun May 19 17:25:34 2024 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun May 19 17:25:34 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4eb49851

create-dev-keyrings.bash: this was split into other scripts and not used since 
2019

>From infra crontabs in 2019 (public SKS was since removed):
```
-# regen dev keyrings every hour (we want to catch revocations early on)
-0 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock 
${REPO}/create-dev-keyrings.bash ${OUTPUTDIR}
+# regen keyrings
+# Fetch from SKS, push to keys.g.o
+0 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock 
${REPO}/keyrings-recv-sks.bash ; /usr/local/bin/pidlock 
${REPO}/keyrings-send-keys.gentoo.org.bash
+# Fetch from keys.g.o & export to keyring files
+*/10 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock 
${REPO}/keyrings-recv-keys.gentoo.org.bash ; /usr/bin/nice 
/usr/local/bin/pidlock ${REPO}/keyrings-export.bash ${OUTPUTDIR}
```

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

 create-dev-keyrings.bash | 60 
 1 file changed, 60 deletions(-)

diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash
deleted file mode 100755
index 3ab1b58..000
--- a/create-dev-keyrings.bash
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# Import key updates from Keyservers
-#
-# TODO:
-# - Turn off export in this script
-
-OUTPUT_DIR=${1:-.}
-BASEDIR="$(dirname "$0")"
-source "${BASEDIR}"/keyrings.inc.bash
-
-set -e
-export_ldap_data_to_env
-
-export KEYSERVERS=( "${KS_SKS}" "${KS_OPENPGP}" "${KS_GENTOO}" )
-export KEYSERVER_TIMEOUT=20m
-
-grab_keys "${SYSTEM_KEYS[@]}"
-export_keys "${OUTPUT_DIR}"/service-keys.gpg \
-   "${SYSTEM_KEYS[@]}"
-
-grab_keys "${INFRA_SYSTEM_KEYS[@]}"
-export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg \
-   "${INFRA_SYSTEM_KEYS[@]}"
-
-grab_keys "${COMMITTING_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/committing-devs.gpg \
-   "${COMMITTING_DEVS[@]}"
-
-grab_keys "${NONCOMMITTING_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/active-devs.gpg \
-   "${COMMITTING_DEVS[@]}" \
-   "${NONCOMMITTING_DEVS[@]}"
-
-grab_keys "${INFRA_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/infra-devs.gpg \
-   "${INFRA_DEVS[@]}"
-
-# -- not all are on keyservers
-# -- and are unlikely to turn up now
-# -- this needs to fetch from some archive instead
-#grab_keys "${RETIRED_DEVS[@]}"
-export_keys "${OUTPUT_DIR}"/retired-devs.gpg \
-   "${RETIRED_DEVS[@]}"
-
-# Everybody together now
-export_keys "${OUTPUT_DIR}"/all-devs.gpg \
-   "${SYSTEM_KEYS[@]}" \
-   "${COMMITTING_DEVS[@]}" \
-   "${NONCOMMITTING_DEVS[@]}" \
-   "${INFRA_DEVS[@]}" \
-   "${RETIRED_DEVS[@]}"
-
-# Populate keys.gentoo.org with the keys we have, since they might have come 
from SKS
-export KEYSERVERS=( "${KS_GENTOO}" )
-export KEYSERVER_TIMEOUT=20m
-push_keys "${SYSTEM_KEYS[@]}"
-push_keys "${COMMITTING_DEVS[@]}"
-push_keys "${NONCOMMITTING_DEVS[@]}"
-push_keys "${INFRA_DEVS[@]}"
-push_keys "${RETIRED_DEVS[@]}"

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

2024-04-29 Thread Sam James

commit: f24da1270bd354e58b6be99e858d23a6e2bf0c78
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 22:03:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 22:03:33 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=f24da127

Makefile.gpyutils, htdocs/index.html: add 3.11->3.12 stable reports

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 12 ++--
 htdocs/index.html |  6 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index a2bba56..75fee4e 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -14,11 +14,11 @@ outdir = /dev/null
 # from 1->2. Especially e.g. git, ninja, meson, doxygen.
 
 # upgrades for stable impls
-upgr_base = $(outdir)/310-to-311.txt
+upgr_base = $(outdir)/310-to-311.txt $(outdir)/311-to-312.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
-upgr_txt = $(upgr_base) $(upgr_streq) $(outdir)/311-to-312.txt
+upgr_txt = $(upgr_base) $(upgr_streq)
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times
@@ -33,10 +33,10 @@ $(outdir)/311-to-312.txt: $(timestamp)
gpy-upgrade-impl -m python3_11 python3_12 > $@.new
mv $@.new $@
 
-#$(outdir)/311-to-312-stablereq.txt: $(timestamp)
-#  mkdir -p $(outdir)
-#  gpy-upgrade-impl -m -s python3_11 python3_12 > $@.new
-#  mv $@.new $@
+$(outdir)/311-to-312-stablereq.txt: $(timestamp)
+   mkdir -p $(outdir)
+   gpy-upgrade-impl -m -s python3_11 python3_12 > $@.new
+   mv $@.new $@
 
 $(outdir)/310-to-311.txt: $(timestamp)
mkdir -p $(outdir)

diff --git a/htdocs/index.html b/htdocs/index.html
index f40051e..60955d2 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -105,6 +105,12 @@
 svg
   
 
+
+  Py3.11 → 3.12 stabilizations
+  
+svg
+  
+
 
   Py3.10 → 3.11 testing

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

2024-04-06 Thread Michał Górny

commit: 7546c5d7bae8d3090c6c0aca67aac3da3a9f70cf
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Apr  6 12:25:03 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr  6 12:25:03 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=7546c5d7

Bump pkgcheck2html

Signed-off-by: Michał Górny  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index d294e14..bb9807d 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit d294e14644c33a2f67d79a642b0956f75307d9f6
+Subproject commit bb9807de3be23ef879e492c0142e770d54ff4507

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

2024-02-06 Thread Ulrich Müller

commit: c866c85ae4475535a83ca24cdda93ed0f61ddcb0
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Feb  6 09:28:00 2024 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Feb  6 09:28:00 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=c866c85a

find-binary-files.sh: Output file version

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

 find-binary-files.sh | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/find-binary-files.sh b/find-binary-files.sh
index 12e6fea..b053d2f 100755
--- a/find-binary-files.sh
+++ b/find-binary-files.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2014-2022 Ulrich Müller
+# Copyright 2014-2024 Ulrich Müller
 # Distributed under the terms of the GNU GPL version 2 or later
 # Author: Ulrich Müller 
 
@@ -47,3 +47,6 @@ done < <(find \( -path ./distfiles -o -path ./local -o -path 
./metadata \
 -exec file -ih '{}' + | sort)
 
 [[ ${count} -gt 0 ]] || echo "No binary files found. :-)"
+
+# Output the file version for debugging of false positives/negatives
+echo; file --version | head -n1

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

2024-01-12 Thread Michał Górny

commit: bded6252da7b96e5030b1a7fcc6b0558d43312fb
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan 12 15:38:56 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan 12 15:38:56 2024 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=bded6252

Bump pkgcheck2html

Signed-off-by: Michał Górny  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 7687737..d294e14 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 7687737db9a333a3b20d9e457e65fd66868da7ce
+Subproject commit d294e14644c33a2f67d79a642b0956f75307d9f6

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

2023-06-29 Thread Robin H. Johnson

commit: d1dda423e1285e94fade299209e58f4434db35ee
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jun 30 05:33:01 2023 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jun 30 05:33:01 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d1dda423

keyrings.inc.bash: ensure digests/packets present

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

 keyrings-export.bash |  4 +++-
 keyrings.inc.bash| 17 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 92c0228..56e4e51 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -6,6 +6,8 @@
 # - requires keeping state to detect changes in keys, there is no usable mtime 
data in a key itself
 
 OUTPUT_DIR=${1:-.}
+# Ensure output is absolute
+OUTPUT_DIR=$(readlink -f "${OUTPUT_DIR}")
 BASEDIR="$(dirname "$0")"
 # shellcheck source=./keyrings.inc.bash
 source "${BASEDIR}"/keyrings.inc.bash
@@ -57,7 +59,7 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
 for key in "${KEYRINGS[@]}" ; do
if [[ ! -L "${OUTPUT_DIR}"/${key}.gpg ]] ; then
# Compatibility symlink
-   ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg
+   ln -sf "${OUTPUT_DIR}"/keys/${key}.gpg 
"${OUTPUT_DIR}"/${key}.gpg
fi
 
if [[ $(date -u +%A) == Monday ]] ; then

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 32fc03f..d2668e0 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -123,14 +123,15 @@ export_keys() {
 
# Check if the textual format has changed at all, and emit the new 
version
# if there are ANY changes at all.
-   if ! cmp -s "${DST}.packets.txt" "${TMP}.packets.txt"; then
-   chmod a+r "${TMP}"
-   mv -f "${TMP}" "${DST}"
-   mv -f "${TMP}.packets.txt" "${DST}.packets.txt"
-   mv -f "${TMP}.DIGESTS" "${DST}.DIGESTS"
-   fi
-   # Cleanup anyway
-   rm -f "${TMP}.packets.txt" "${TMP}"
+   cmp -s "${DST}.packets.txt" "${TMP}.packets.txt"
+   cmp_rc=$?
+   chmod a+r "${TMP}" "${TMP}.packets.txt" "${TMP}.DIGESTS"
+   for suffix in '' '.packets.txt' '.DIGESTS'; do
+   # If these file do not exist, or the cmp was different, move 
them.
+   [ ! -f "${DST}${suffix}" -o $cmp_rc -ne 0 ] && mv -f 
"${TMP}${suffix}" "${DST}${suffix}"
+   # Cleanup anyway
+   rm -f "${TMP}${suffix}"
+   done
 }
 
 # populate common variables

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

2023-06-29 Thread Robin H. Johnson

commit: 7112f5af5a5b681d6c8d39c2ff0cf27252fc81f3
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jun 30 05:06:42 2023 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jun 30 05:06:51 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=7112f5af

keyrings-export.bash: fixup export

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

 keyrings-export.bash | 25 +
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index b3234e2..92c0228 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -17,35 +17,44 @@ export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b 
"${DEV_BASE}" "${NONC
 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 -a INFRA_SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${INFRA_SYSTEM_RULE}") )
+export -a KEYRINGS=( )
 
 export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \
-   "${SYSTEM_KEYS[@]}"
+   "${SYSTEM_KEYS[@]}" \
+&& KEYRINGS+=( service-keys )
 
 export_keys "${OUTPUT_DIR}"/keys/infra-service-keys.gpg \
-"${INFRA_SYSTEM_KEYS[@]}"
+"${INFRA_SYSTEM_KEYS[@]}" \
+&& KEYRINGS+=( infra-service-keys )
 
 export_keys "${OUTPUT_DIR}"/keys/committing-devs.gpg \
-   "${COMMITTING_DEVS[@]}"
+   "${COMMITTING_DEVS[@]}" \
+&& KEYRINGS+=( committing-devs )
 
 export_keys "${OUTPUT_DIR}"/keys/active-devs.gpg \
"${COMMITTING_DEVS[@]}" \
-   "${NONCOMMITTING_DEVS[@]}"
+   "${NONCOMMITTING_DEVS[@]}" \
+&& KEYRINGS+=( active-devs )
 
 export_keys "${OUTPUT_DIR}"/keys/infra-devs.gpg \
-   "${INFRA_DEVS[@]}"
+   "${INFRA_DEVS[@]}" \
+&& KEYRINGS+=( infra-devs )
 
 export_keys "${OUTPUT_DIR}"/keys/retired-devs.gpg \
-   "${RETIRED_DEVS[@]}"
+   "${RETIRED_DEVS[@]}" \
+&& KEYRINGS+=( retired-devs )
 
 # Everybody together now
 export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${SYSTEM_KEYS[@]}" \
+   "${INFRA_SYSTEM_KEYS[@]}" \
"${COMMITTING_DEVS[@]}" \
"${NONCOMMITTING_DEVS[@]}" \
"${INFRA_DEVS[@]}" \
-   "${RETIRED_DEVS[@]}"
+   "${RETIRED_DEVS[@]}" \
+&& KEYRINGS+=( all-devs )
 
-for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
+for key in "${KEYRINGS[@]}" ; do
if [[ ! -L "${OUTPUT_DIR}"/${key}.gpg ]] ; then
# Compatibility symlink
ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg

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

2023-06-29 Thread Robin H. Johnson

commit: 6dd35cefc5fcaf0662708b5952038bce528979ff
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jun 30 05:18:58 2023 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jun 30 05:18:58 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=6dd35cef

keyrings.inc.bash: ensure there is a checksum to verify the download for 
corruption (integrity only, not authenticity)

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

 keyrings.inc.bash | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index cc89de0..32fc03f 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -96,7 +96,8 @@ export_keys() {
DST="$1"
shift
setup_tmp
-   TMP="${GPG_TMPDIR}"/$(basename "${DST}")
+   BASENAME=$(basename "${DST}")
+   TMP="${GPG_TMPDIR}/${BASENAME}"
# Must not exist, otherwise GPG will give error
[[ -f "${TMP}" ]] && rm -f "${TMP}"
# 'gpg --export' returns zero if there was no error with the command 
itself
@@ -116,12 +117,17 @@ export_keys() {
echo "Unable to export keys to $DST: GPG failed to list packets"
exit 1
fi
+
+   # Ensure we have a checksum to verify the file.
+   rhash --bsd --sha256 --sha512 --blake2b "${TMP}" |sed 
"s,${TMP},${BASENAME},g" >"${TMP}.DIGESTS"
+
# Check if the textual format has changed at all, and emit the new 
version
# if there are ANY changes at all.
if ! cmp -s "${DST}.packets.txt" "${TMP}.packets.txt"; then
chmod a+r "${TMP}"
mv -f "${TMP}" "${DST}"
mv -f "${TMP}.packets.txt" "${DST}.packets.txt"
+   mv -f "${TMP}.DIGESTS" "${DST}.DIGESTS"
fi
# Cleanup anyway
rm -f "${TMP}.packets.txt" "${TMP}"

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

2023-05-31 Thread Sam James

commit: 437523a5a1a442d28e84a2cb3ff84d4e031560d6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 05:41:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 05:41:58 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=437523a5

htdocs: add link to py311->py312 svg/graph

Signed-off-by: Sam James  gentoo.org>

 htdocs/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index 681c037..f40051e 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -101,6 +101,9 @@
   
 
   Py3.11 → 3.12 testing
+  
+svg
+  
 
 
   Py3.10 → 3.11 testing

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

2023-05-31 Thread Sam James

commit: 2753decf7e7b1c0c811a82d489c326e3a7bd6582
Author: Sam James  gentoo  org>
AuthorDate: Wed May 31 20:17:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 20:17:37 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=2753decf

Makefile.gpyutils: add note about speeding up porting

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 51e56c2..a2bba56 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -9,6 +9,9 @@ outdir = /dev/null
 # 1. Create rules below & add to upgr_all
 # 2. Later, when dot doesn't take too long for it, move to upgr_txt
 # 3. Once the impl is stable, move to upgr_base
+#
+# Please prioritize edges like python-any-r1 consumers to speed up getting
+# from 1->2. Especially e.g. git, ninja, meson, doxygen.
 
 # upgrades for stable impls
 upgr_base = $(outdir)/310-to-311.txt

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

2023-05-31 Thread Sam James

commit: 6d28f00f48078ccb2b49547258cc3076c8c3c9b0
Author: Petr Vaněk  atlas  cz>
AuthorDate: Wed May 31 08:36:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 31 20:13:10 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=6d28f00f

Makefile.gpyutils: enable py3.12 graphs

They generate within reasonable time frame, ~17 mins in my case.

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/qa-scripts/pull/3
Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index cb228c7..51e56c2 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -15,11 +15,11 @@ upgr_base = $(outdir)/310-to-311.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
-upgr_txt = $(upgr_base) $(upgr_streq)
+upgr_txt = $(upgr_base) $(upgr_streq) $(outdir)/311-to-312.txt
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times
-upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/311-to-312.txt 
$(outdir)/311-to-312.dot
+upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg)
 
 all = $(upgr_all)

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

2023-05-26 Thread Sam James

commit: 7e86c02b67589976534c563686ae923353755d97
Author: Petr Vaněk  atlas  cz>
AuthorDate: Fri May 26 12:52:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 26 13:34:46 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=7e86c02b

Makefile.gpyutils: enable .dot file for 3.12

The .dot file can be useful as it provides detailed graphical
information, even when a final .svg has not been generated. This could
be beneficial for anyone who wants to access this information without
having to generate the complete .svg.

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/qa-scripts/pull/2
Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 77fa182..cb228c7 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -19,7 +19,7 @@ upgr_txt = $(upgr_base) $(upgr_streq)
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times
-upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/311-to-312.txt
+upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/311-to-312.txt 
$(outdir)/311-to-312.dot
 
 all = $(upgr_all)

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

2023-05-24 Thread Sam James

commit: 92393b2ac28d0e4087eeacfe4ba365c4ee94e8db
Author: Sam James  gentoo  org>
AuthorDate: Thu May 25 02:24:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 25 02:24:04 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=92393b2a

Makefile.gpyutils: give up on 3.12 graphs for now

I let it run for like, 9 hours locally and got nowhere.

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index d34f942..77fa182 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,7 +6,7 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # Adding new implementations:
-# 1. Add to upgr_all
+# 1. Create rules below & add to upgr_all
 # 2. Later, when dot doesn't take too long for it, move to upgr_txt
 # 3. Once the impl is stable, move to upgr_base
 
@@ -15,11 +15,11 @@ upgr_base = $(outdir)/310-to-311.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
-upgr_txt = $(upgr_base) $(upgr_streq) $(outdir)/311-to-312.txt
+upgr_txt = $(upgr_base) $(upgr_streq)
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times
-upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) #$(outdir)/311-to-312.txt
+upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/311-to-312.txt
 
 all = $(upgr_all)

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

2023-05-24 Thread Sam James

commit: 0750bcb0c088d7c81e96607ec3d6e61f80149d2f
Author: Sam James  gentoo  org>
AuthorDate: Wed May 24 17:20:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 24 17:20:34 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0750bcb0

Makefile.gpyutils: fix target, add instructions

... given I clearly keep getting it wrong.

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 906b7fa..d34f942 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -5,12 +5,17 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 # pass via make!
 outdir = /dev/null
 
+# Adding new implementations:
+# 1. Add to upgr_all
+# 2. Later, when dot doesn't take too long for it, move to upgr_txt
+# 3. Once the impl is stable, move to upgr_base
+
 # upgrades for stable impls
-upgr_base = $(outdir)/310-to-311.txt $(outdir)/311-to-312.txt
+upgr_base = $(outdir)/310-to-311.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
-upgr_txt = $(upgr_base) $(upgr_streq)
+upgr_txt = $(upgr_base) $(upgr_streq) $(outdir)/311-to-312.txt
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times

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

2023-05-24 Thread Sam James

commit: 484ef260f73dd42940d629282ff8c519aa0b805f
Author: Sam James  gentoo  org>
AuthorDate: Wed May 24 12:00:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 24 12:00:13 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=484ef260

htdocs: link to py3.11->py3.12 porting list

Signed-off-by: Sam James  gentoo.org>

 htdocs/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index 212f2bb..681c037 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -99,6 +99,9 @@
 
   Python reports
   
+
+  Py3.11 → 3.12 testing
+
 
   Py3.10 → 3.11 testing

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

2023-05-24 Thread Sam James

commit: f5cb7c92a00cc53028284595a57e3498d381c119
Author: Sam James  gentoo  org>
AuthorDate: Wed May 24 11:59:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 24 11:59:17 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=f5cb7c92

Makefile.gpyutils: try to generate Python 3.12 graphs too

May revert this if it takes far too long but we'd like it if we can.

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 0bee5d8..906b7fa 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,7 +6,7 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # upgrades for stable impls
-upgr_base = $(outdir)/310-to-311.txt #$(outdir)/311-to-312.txt
+upgr_base = $(outdir)/310-to-311.txt $(outdir)/311-to-312.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
@@ -14,7 +14,7 @@ upgr_txt = $(upgr_base) $(upgr_streq)
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times
-upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/311-to-312.txt
+upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) #$(outdir)/311-to-312.txt
 
 all = $(upgr_all)

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

2023-05-24 Thread Sam James

commit: a6db9065c2f7c861115e04228023022d0b7bba0a
Author: Sam James  gentoo  org>
AuthorDate: Wed May 24 09:35:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 24 09:35:19 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=a6db9065

Makefile.gpyutils: add missing Python 3.12 wiring work

Fixes: c3702bded26f1acfa69c12b5ff5c73bac11999e6
Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index df7547d..0bee5d8 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -14,7 +14,7 @@ upgr_txt = $(upgr_base) $(upgr_streq)
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times
-upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) #$(outdir)/311-to-312.txt
+upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/311-to-312.txt
 
 all = $(upgr_all)

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

2023-05-24 Thread Sam James

commit: c3702bded26f1acfa69c12b5ff5c73bac11999e6
Author: Sam James  gentoo  org>
AuthorDate: Wed May 24 07:06:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 24 07:06:57 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=c3702bde

Makefile.gpyutils: try to enable Python 3.12 lists

We're hoping that this is doable even this early on given ros is gone now..

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 52e1ce2..df7547d 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,7 +6,7 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # upgrades for stable impls
-upgr_base = $(outdir)/310-to-311.txt
+upgr_base = $(outdir)/310-to-311.txt #$(outdir)/311-to-312.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
@@ -20,6 +20,16 @@ all = $(upgr_all)
 
 all: $(all)
 
+$(outdir)/311-to-312.txt: $(timestamp)
+   mkdir -p $(outdir)
+   gpy-upgrade-impl -m python3_11 python3_12 > $@.new
+   mv $@.new $@
+
+#$(outdir)/311-to-312-stablereq.txt: $(timestamp)
+#  mkdir -p $(outdir)
+#  gpy-upgrade-impl -m -s python3_11 python3_12 > $@.new
+#  mv $@.new $@
+
 $(outdir)/310-to-311.txt: $(timestamp)
mkdir -p $(outdir)
gpy-upgrade-impl -m python3_10 python3_11 > $@.new

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

2023-04-19 Thread Michał Górny

commit: 9cd5fc20cb5d3f3704af3b14d7352c903b214696
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Apr 19 06:35:36 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Apr 19 06:35:36 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=9cd5fc20

Remove py3.9 → py3.10 lists

Signed-off-by: Michał Górny  gentoo.org>

 Makefile.gpyutils | 12 +---
 htdocs/index.html | 12 
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 346cde5..52e1ce2 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,7 +6,7 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # upgrades for stable impls
-upgr_base = $(outdir)/39-to-310.txt $(outdir)/310-to-311.txt
+upgr_base = $(outdir)/310-to-311.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
@@ -30,16 +30,6 @@ $(outdir)/310-to-311-stablereq.txt: $(timestamp)
gpy-upgrade-impl -m -s python3_10 python3_11 > $@.new
mv $@.new $@
 
-$(outdir)/39-to-310.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-upgrade-impl -m python3_9 python3_10 > $@.new
-   mv $@.new $@
-
-$(outdir)/39-to-310-stablereq.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-upgrade-impl -m -s python3_9 python3_10 > $@.new
-   mv $@.new $@
-
 %.dot: %.txt
gpy-depgraph -m pyt...@gentoo.org $< > $@.new
mv $@.new $@

diff --git a/htdocs/index.html b/htdocs/index.html
index 2dcfc55..212f2bb 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -99,18 +99,6 @@
 
   Python reports
   
-
-  Py3.9 → 3.10 testing
-  
-svg
-  
-
-
-  Py3.9 → 3.10 stabilizations
-  
-svg
-  
-
 
   Py3.10 → 3.11 testing

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

2023-04-13 Thread Robin H. Johnson

commit: ffa7706c877f8aafaa62ada3b45fcd56e5769ae8
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Apr 13 17:33:11 2023 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Apr 13 17:33:11 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ffa7706c

leaf-packages: pylint

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

 leaf-packages.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/leaf-packages.py b/leaf-packages.py
index 976cb31..448f7cf 100755
--- a/leaf-packages.py
+++ b/leaf-packages.py
@@ -8,7 +8,7 @@ import re
 import subprocess
 import sys
 
-method="pkgcore"
+METHOD="pkgcore"
 
 def main() -> None:
 if len(sys.argv) > 1:
@@ -21,7 +21,7 @@ def main() -> None:
 for ebuild in zero_in_degree:
 # Let the executor run function call
 # update_for_deps_of(ebuild, zero_in_degree)
-if method == "pkgcore":
+if METHOD == "pkgcore":
 executor.submit(update_for, ebuild, zero_in_degree, repo)
 else:
 executor.submit(update_for_deps_of, ebuild, zero_in_degree)

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

2023-04-13 Thread Robin H. Johnson

commit: 961117f0946067e19c77c1050ab90e634a0fccdd
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Apr 13 17:36:15 2023 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Apr 13 17:36:15 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=961117f0

leaf-packages.py: make quieter

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

 leaf-packages.py | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/leaf-packages.py b/leaf-packages.py
index 448f7cf..1454eb8 100755
--- a/leaf-packages.py
+++ b/leaf-packages.py
@@ -9,6 +9,7 @@ import subprocess
 import sys
 
 METHOD="pkgcore"
+VERBOSE=int(os.getenv('VERBOSE') or os.getenv('V') or 0) # V=1..N to use
 
 def main() -> None:
 if len(sys.argv) > 1:
@@ -38,7 +39,9 @@ def update_for(ebuild: str, zero_in_degree: dict, repo: str) 
-> None:
 Reverse dependencies of the ebuild will be searched in the specified
 repository only.
 """
-print(f"Processing {ebuild} ...", file=sys.stderr)
+# This spams infra cronjobs, only enable if there is a problem
+if VERBOSE >= 1:
+print(f"Processing {ebuild} ...", file=sys.stderr)
 proc = subprocess.run(f'pquery --first --restrict-revdep ={ebuild} '
   f'--repo {repo} --raw --unfiltered',
   capture_output=True, text=True, shell=True)
@@ -89,7 +92,8 @@ def update_for_deps_of(ebuild: str, zero_in_degree: dict) -> 
None:
   capture_output=True, text=True, shell=True)
 return proc.stdout.splitlines()
 
-#print(f"Processing {ebuild} ...", file=sys.stderr)
+if VERBOSE >= 2:
+print(f"Processing {ebuild} ...", file=sys.stderr)
 
 # Get dependency specifications in the ebuild;
 # equivalent to dep_graph[ebuild] in the examples above

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

2023-03-23 Thread Michał Górny

commit: 35b2a1ae9f1e351759ffe57e9f2957eded2d6cd2
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar 24 05:23:24 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 24 05:24:00 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=35b2a1ae

genrdeps-index: Use new pkgcore API

Signed-off-by: Michał Górny  gentoo.org>

 genrdeps-index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genrdeps-index.py b/genrdeps-index.py
index 32a0d12..9b1cd85 100755
--- a/genrdeps-index.py
+++ b/genrdeps-index.py
@@ -64,7 +64,7 @@ def main():
 args = argp.parse_args()
 
 c = pkgcore.config.load_config()
-repo = c.repo['gentoo']
+repo = c.objects.repo['gentoo']
 
 rindex = {}
 for g, gi in GROUPS:

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

2023-01-21 Thread Sam James

commit: 554dce27a06c05557dcab5d6951f044abf9a2b22
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 21 06:12:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 06:29:40 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=554dce27

htdocs: restore py3.11 graph links

We're generating it again now.

Signed-off-by: Sam James  gentoo.org>

 htdocs/index.html | 9 +
 1 file changed, 9 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index 94e9a99..2dcfc55 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -113,7 +113,16 @@
 
 
   Py3.10 → 3.11 testing
+  
+svg
+  
  
+
+  Py3.10 → 3.11 stabilizations
+  
+svg
+  
+
   
   Generated artifacts

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

2023-01-21 Thread Sam James

commit: 49ffb98996233b61b6f380bf9331d9558791b130
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 22 06:09:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 06:10:33 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=49ffb989

Makefile.gpyutils: drop obsolete py2 refs

Fixes: a33a67bc0ec417497c5a018f89750f90bea66fa1
Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 3bf4284..346cde5 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -10,7 +10,7 @@ upgr_base = $(outdir)/39-to-310.txt $(outdir)/310-to-311.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
-upgr_txt = $(upgr_base) $(upgr_streq) $(outdir)/py2.txt
+upgr_txt = $(upgr_base) $(upgr_streq)
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times

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

2023-01-20 Thread Sam James

commit: ae89dda28b13877e27b47d598fca8c296e853f39
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 21 06:11:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 21 06:11:11 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ae89dda2

Makefile.gpyutils: try again for py3.10->py3.11 graph

The impl is stable now, so...

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index ff60d5c..3bf4284 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,7 +6,7 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # upgrades for stable impls
-upgr_base = $(outdir)/39-to-310.txt
+upgr_base = $(outdir)/39-to-310.txt $(outdir)/310-to-311.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
@@ -14,7 +14,7 @@ upgr_txt = $(upgr_base) $(upgr_streq) $(outdir)/py2.txt
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
 # add new impls here if not stable yet, to avoid insanely huge generation times
-upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/310-to-311.txt
+upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) #$(outdir)/311-to-312.txt
 
 all = $(upgr_all)

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

2023-01-18 Thread Sam James

commit: 1d65e1921d23cc9471ed4d909429f98bed0bfcf2
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 18:28:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 18:28:40 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=1d65e192

eapi-usage.sh: update commentary re pinspect usage

We previously stopped using it because pkgcore at the time lacked support
for newer EAPIs (>= EAPI 5), but now it's less appealing to switch back
despite the elegance (and nicer output, I suppose) given the awk works
and is a fair bit faster.

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 62e878f..b7a1112 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -56,12 +56,14 @@ mv ${TMPDIR}/eapi-usage/*.txt ${dir}/ || exit 1
 rm -r "${TMPDIR}" || exit 1
 
 # Now generate the numbers/summary (copied in from previous eapi_usage.sh 
script)
-# Boring 'script' that just uses pkgcore's pinspect command. Someday it would 
be
-# nice to graph this output, or maybe keep some running history?
-
+# Someday it would be nice to graph this output, or maybe keep some running 
history?
+# TODO: We used pinspect in the past which is cleaner but it's slower than the
+# awk method used below (we also stopped using it because at the time, pkgcore
+# lacked newer EAPI support).
 #[[ $(type pinspect 2> /dev/null) ]] || exit 1
 #
 #pinspect eapi_usage /usr/portage
+
 find "${REPO_PATH}"/metadata/md5-cache -type f ! -name '*.gz' \
   -exec grep -h '^EAPI=' '{}' + \
   | awk '

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

2023-01-18 Thread Sam James

commit: 5b1b482e139e9b1959ec70335aa844c258a60f4e
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 18:15:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 18:16:40 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=5b1b482e

eapi-usage.sh: optimise + refactor

- Use Bash primitives (parameter expansion) to avoid cut/rev (2x) calls, as well
  as grep!

- Switch to while/read/find loop for improved robustness over while which
  can have issues wrt globbing/special file names.

Thanks to ulm for the suggestions.

Thanks-to: Ulrich Müller  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index e4b65b2..62e878f 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -32,12 +32,12 @@ cd eapi-usage || exit 1
 
 ebegin "Finding ebuilds"
 (
-   for ebuild in $(find "${REPO_PATH}/metadata/md5-cache" -mindepth 2 
-maxdepth 2 -type f -name '*-[0-9]*') ; do
-   cpf=$(echo ${ebuild} | rev | cut -d/ -f1-2 | rev)
-   eapi=$(grep -oi "eapi=.*" ${ebuild} | sed -e 's:EAPI=::')
-
+   while IFS= read -r ebuild ; do
+   cpf_eapi="${ebuild#${REPO_PATH}/metadata/md5-cache/}"
+   cpf="${cpf_eapi%%:*}"
+   eapi="${cpf_eapi##*:EAPI=}"
echo "${cpf}" >> ${eapi}.txt
-   done
+   done < <(find "${REPO_PATH}/metadata/md5-cache" -mindepth 2 -maxdepth 2 
-type f -name '*-[0-9]*' -exec grep '^EAPI=' {} +)
 ) || { eend $? || exit 1; }
 eend ${?}

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

2023-01-14 Thread Michał Górny

commit: 1cff8b5c256f9e1d93a130065b5e8cf8fda57b86
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 14 15:44:38 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 14 15:44:51 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=1cff8b5c

Removed py3.8→3.9 reports

Signed-off-by: Michał Górny  gentoo.org>

 Makefile.gpyutils | 12 +---
 htdocs/index.html | 12 
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index b1d02e7..ff60d5c 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,7 +6,7 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # upgrades for stable impls
-upgr_base = $(outdir)/39-to-310.txt $(outdir)/38-to-39.txt
+upgr_base = $(outdir)/39-to-310.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
@@ -40,16 +40,6 @@ $(outdir)/39-to-310-stablereq.txt: $(timestamp)
gpy-upgrade-impl -m -s python3_9 python3_10 > $@.new
mv $@.new $@
 
-$(outdir)/38-to-39.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-upgrade-impl -m python3_8 python3_9 > $@.new
-   mv $@.new $@
-
-$(outdir)/38-to-39-stablereq.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-upgrade-impl -m -s python3_8 python3_9 > $@.new
-   mv $@.new $@
-
 %.dot: %.txt
gpy-depgraph -m pyt...@gentoo.org $< > $@.new
mv $@.new $@

diff --git a/htdocs/index.html b/htdocs/index.html
index efc5eae..94e9a99 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -99,18 +99,6 @@
 
   Python reports
   
-
-  Py3.8 → 3.9 testing
-  
-svg
-  
-
-
-  Py3.8 → 3.9 stabilizations
-  
-svg
-  
-
 
   Py3.9 → 3.10 testing

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

2023-01-12 Thread Sam James

commit: d135582504131b752e5d5c068b21b92fd30f4f4b
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 07:44:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 07:44:36 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d1355825

index.html: add bugs last touched in 2022

Signed-off-by: Sam James  gentoo.org>

 htdocs/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index 4d8e34e..efc5eae 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -183,6 +183,7 @@
 https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2020-01-01=2019-01-01;
 class="list-group-item list-group-item-action">2019
 https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2021-01-01=2020-01-01;
 class="list-group-item list-group-item-action">2020
 https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2022-01-01=2021-01-01;
 class="list-group-item list-group-item-action">2021
+https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2023-01-01=2022-01-01;
 class="list-group-item list-group-item-action">2022

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

2023-01-12 Thread Ulrich Müller

commit: 3d258b05547410f51f80d7fdebe960f9591901b2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Jan 12 17:52:29 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Jan 12 17:52:29 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=3d258b05

index.html: Update copyright years

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

 htdocs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 2c4e03c..4d8e34e 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -210,7 +210,7 @@
 
   
   
- 20012020 Gentoo Authors
+ 20012023 Gentoo Authors
 
   Gentoo is a trademark of the Gentoo Foundation, Inc.
   The contents of this document, unless otherwise expressly 
stated, are licensed under the

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

2023-01-12 Thread Ulrich Müller

commit: 94bc7ab980ae5c1167fc30f12a57bbe3c4873964
Author: Florian Schmaus  gentoo  org>
AuthorDate: Thu Jan 12 15:31:34 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Jan 12 17:22:45 2023 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=94bc7ab9

index.html: Add leaf-packages.html report

Signed-off-by: Florian Schmaus  gentoo.org>
Signed-off-by: Ulrich Müller  gentoo.org>

 htdocs/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index d38cc56..2c4e03c 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -147,6 +147,7 @@
 Top 100 largest FILESDIRs
 Binary files in ::gentoo
 Listing of packages that inherit an eclass
+Leaf Packages
 
   Gentoo CI – QA check results

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

2022-11-01 Thread Sam James

commit: e5323d2232b5b24d7481c5175777f15e9b2e68cd
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  1 22:44:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  1 22:44:27 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=e5323d22

keyrings-export.bash: use "last monday" / fix timestamped files generation

Don't generate the timestamped files on Mondays to avoid "last" / "next"
Monday confusion

We want to avoid generating stuff like all-devs-20221107.gpg.

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 35c9959..b3234e2 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -51,7 +51,12 @@ for key in service-keys committing-devs active-devs 
infra-devs retired-devs all-
ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg
fi
 
-   timestamp=$(date -u +%Y%m%d-%A -d "monday")
+   if [[ $(date -u +%A) == Monday ]] ; then
+   # We don't want to run on Mondays to avoid last/next week 
confusion
+   break
+   fi
+
+   timestamp=$(date -u +%Y%m%d-%A -d "last monday")
 
if [[ ${timestamp} != *-Monday ]] ; then
break

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

2022-10-31 Thread John Helmert III

commit: a33a67bc0ec417497c5a018f89750f90bea66fa1
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Oct 31 19:28:23 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Oct 31 19:29:57 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=a33a67bc

drop gpy-py2 handling

Signed-off-by: John Helmert III  gentoo.org>

 Makefile.gpyutils | 5 -
 1 file changed, 5 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index eb355d8..b1d02e7 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -50,11 +50,6 @@ $(outdir)/38-to-39-stablereq.txt: $(timestamp)
gpy-upgrade-impl -m -s python3_8 python3_9 > $@.new
mv $@.new $@
 
-$(outdir)/py2.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-py2 > $@.new
-   mv $@.new $@
-
 %.dot: %.txt
gpy-depgraph -m pyt...@gentoo.org $< > $@.new
mv $@.new $@

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

2022-10-14 Thread Sam James

commit: 0dfee6dcb366181a046b4e59bd483e0006f5bd17
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 15 01:08:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 15 01:08:44 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0dfee6dc

pkgcheck2html: bump version

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 0794388..7687737 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 07943881432d8f4aecb961dab80151fd584e8b3f
+Subproject commit 7687737db9a333a3b20d9e457e65fd66868da7ce

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

2022-10-14 Thread Sam James

commit: ae07f7521f964dffc8dcb1485559168dd7151f83
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 15 00:58:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 15 00:59:13 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ae07f752

pkgcheck2html: bump version

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 2892dda..0794388 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 2892dda2f1945de84c7ca98cceb0f7dc66e24869
+Subproject commit 07943881432d8f4aecb961dab80151fd584e8b3f

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

2022-10-10 Thread John Helmert III

commit: 1731d58dd5b7cffbb6bd8dc3bd49e9e8642b814f
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Oct 10 23:53:44 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Oct 10 23:56:01 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=1731d58d

keyrings: disable using local keyserver

Somehow this is vastly, vastly slower than simply using
keys.gentoo.org even though they should be resolving to the same host.

Bug: https://bugs.gentoo.org/876532
Signed-off-by: John Helmert III  gentoo.org>

 keyrings.inc.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 58881ae..cc89de0 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -11,8 +11,8 @@ 
INFRA_SYSTEM_RULE='(&(gentooAccess=infra-system.group)(gentooStatus=active))'
 
 export KS_GENTOO=hkps://keys.gentoo.org/
 # Use local keyserver for speedup
-KS_GENTOO_LOCAL=${HOSTNAME%.gentoo.org}.keys.gentoo.org
-dig $KS_GENTOO_LOCAL +short |grep -sq . && export 
KS_GENTOO=hkps://${KS_GENTOO_LOCAL}
+# KS_GENTOO_LOCAL=${HOSTNAME%.gentoo.org}.keys.gentoo.org
+# dig $KS_GENTOO_LOCAL +short |grep -sq . && export 
KS_GENTOO=hkps://${KS_GENTOO_LOCAL}
 
 #export KS_SKS=hkps://hkps.pool.sks-keyservers.net/ # Disabled pending 
security announcement
 export KS_OPENPGP=hkps://keys.openpgp.org/ # runs Hagrid

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

2022-10-10 Thread John Helmert III

commit: d51605cc9b7070cd294989022fedc4ddc4faafb8
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Oct 10 19:53:01 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Oct 10 19:53:01 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d51605cc

keyrings.inc.bash: gpgconf --kill all on cleanup

Signed-off-by: John Helmert III  gentoo.org>

 keyrings.inc.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 9c2a23b..58881ae 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -81,7 +81,7 @@ push_keys() {
 export GPG_TMPDIR=''
 clean_tmp() {
# Ensure any agent is closed down
-   gpgconf --kill gpg-agent
+   gpgconf --kill all
[ -n "$GPG_TMPDIR" ] && [ -d "$GPG_TMPDIR" ] && rm -rf "$GPG_TMPDIR"
 }
 setup_tmp() {

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

2022-10-08 Thread Sam James

commit: 85455be3384328a0ed31be1c1694236adbc2d21c
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 18:59:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 18:59:49 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=85455be3

pkgcheck2html: bump version

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 2e6481e..2892dda 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 2e6481e9b693313b302710c8c4fe8fd22b61a605
+Subproject commit 2892dda2f1945de84c7ca98cceb0f7dc66e24869

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

2022-10-08 Thread Sam James

commit: 21569a514fd72e37a50b71074bc5e3af69b58dc2
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 18:30:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 18:30:48 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=21569a51

pkgcheck2html: bump version

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 2bb29ed..2e6481e 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 2bb29ed8342085a47ec616f554bc3cb6878f9e71
+Subproject commit 2e6481e9b693313b302710c8c4fe8fd22b61a605

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

2022-10-08 Thread Sam James

commit: d4a1a1485b829d81be235f47ed16b58b9211ca02
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 17:18:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 17:18:44 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d4a1a148

pkgcheck2html: bump version

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 91607a7..2bb29ed 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 91607a7441f78c0239c61ef55e57eb79278d5793
+Subproject commit 2bb29ed8342085a47ec616f554bc3cb6878f9e71

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

2022-10-08 Thread Sam James

commit: 35edf0777842c607c8c60821e95f09cd4bdb9f9d
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 12:24:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 12:24:25 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=35edf077

pkgcheck2html: bump version

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 9f25cd3..91607a7 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 9f25cd3e04981e2ac481cea810cb3300134a4120
+Subproject commit 91607a7441f78c0239c61ef55e57eb79278d5793

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

2022-10-03 Thread Sam James

commit: fc3c690916aa2f1989353e36581c7101b11339c7
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  4 03:46:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  4 03:46:11 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=fc3c6909

pkgcheck2html: bump version

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 0662499..9f25cd3 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 066249973b4e78bbd187f9afa7e267f104d6e655
+Subproject commit 9f25cd3e04981e2ac481cea810cb3300134a4120

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

2022-09-02 Thread Sam James

commit: 739916f6b5abd72102f65a8fe7530add40ca4da2
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 02:50:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 02:50:18 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=739916f6

keyrings-export.bash: fix check

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 39091f4..35c9959 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -53,7 +53,7 @@ for key in service-keys committing-devs active-devs 
infra-devs retired-devs all-
 
timestamp=$(date -u +%Y%m%d-%A -d "monday")
 
-   if [[ ${timestamp} != *-Monday ]] ;
+   if [[ ${timestamp} != *-Monday ]] ; then
break
fi

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

2022-09-02 Thread Sam James

commit: 0d01497249a825e1d39862fd9d9ed6edde9a92bf
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 01:23:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 01:23:04 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0d014972

keyrings-export.bash: only run weekly for timestamped files

Otherwise we'd end up having files like service-keys-20220905.gpg
created on 20220830.

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 815c50b..39091f4 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -51,7 +51,13 @@ for key in service-keys committing-devs active-devs 
infra-devs retired-devs all-
ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg
fi
 
-   timestamp=$(date -u +%Y%m%d -d "monday")
+   timestamp=$(date -u +%Y%m%d-%A -d "monday")
+
+   if [[ ${timestamp} != *-Monday ]] ;
+   break
+   fi
+
+   timestamp=${timestamp/-Monday/}
 
# Don't clobber existing timestamped keys for this period (weekly)
# if we're running several times a day.

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

2022-07-30 Thread Sam James

commit: e2bd072dd9f8c58c3211cacd1a526d4af09b2cc2
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 31 01:57:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 31 01:57:29 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=e2bd072d

pkgcheck2html: update

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 627..0662499 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 6276e530d5b7fe19910173ed0c04f405dd24
+Subproject commit 066249973b4e78bbd187f9afa7e267f104d6e655

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

2022-07-30 Thread Sam James

commit: 162f84200d5c5d8c19c5d61a769b0cea694e7d7a
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 31 01:34:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 31 01:34:25 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=162f8420

pkgcheck2html: update

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index ac60b9e..627 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit ac60b9e4642f0895caaed7d81a6a4d38bd652fa9
+Subproject commit 6276e530d5b7fe19910173ed0c04f405dd24

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

2022-07-24 Thread Ulrich Müller

commit: 2ab0c90eb31aeed1a4a95d79181d2dbcb42dbe7d
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul 24 22:51:29 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul 24 22:51:29 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=2ab0c90e

find-binary-files.sh: Account for image/x-xpixmap

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

 find-binary-files.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/find-binary-files.sh b/find-binary-files.sh
index db3ecb8..12e6fea 100755
--- a/find-binary-files.sh
+++ b/find-binary-files.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2014-2019 Ulrich Müller
+# Copyright 2014-2022 Ulrich Müller
 # Distributed under the terms of the GNU GPL version 2 or later
 # Author: Ulrich Müller 
 
@@ -33,6 +33,7 @@ while read line; do
 "image/svg; charset=us-ascii") ;; # SVG image
 "image/svg+xml; charset=us-ascii") ;; # SVG image
 "image/x-xpmi; charset=us-ascii") ;;  # XPM image
+"image/x-xpixmap; charset=us-ascii") ;;  # XPM image
 "message/rfc822; charset=us-ascii") ;;
 "message/rfc822; charset=utf-8") ;;
 *)

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

2022-07-23 Thread Sam James

commit: 30a30507c911d4048000dbbc1a3bc195e960a86e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 01:19:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 01:19:38 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=30a30507

leaf-packages.py: add Python shebang

Signed-off-by: Sam James  gentoo.org>

 leaf-packages.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/leaf-packages.py b/leaf-packages.py
index 15cafe8..976cb31 100755
--- a/leaf-packages.py
+++ b/leaf-packages.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # From Leo3418's GSoC 2021 work
 # https://leo3418.github.io/2021/07/18/find-leaf-packages.html

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

2022-07-22 Thread Sam James

commit: 74a65d4b6351542d084ecedaa2a07c3e653fb5ee
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 23 02:58:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 23 02:59:52 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=74a65d4b

leaf-packages.py: add new script

See https://leo3418.github.io/2021/07/18/find-leaf-packages.html
from Leo3418's GSoC 2021 work.

Thanks-to: Yuan Liao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 leaf-packages.py | 113 +++
 1 file changed, 113 insertions(+)

diff --git a/leaf-packages.py b/leaf-packages.py
new file mode 100755
index 000..15cafe8
--- /dev/null
+++ b/leaf-packages.py
@@ -0,0 +1,113 @@
+# From Leo3418's GSoC 2021 work
+# https://leo3418.github.io/2021/07/18/find-leaf-packages.html
+
+import concurrent.futures
+import os
+import re
+import subprocess
+import sys
+
+method="pkgcore"
+
+def main() -> None:
+if len(sys.argv) > 1:
+repo = sys.argv[1]
+else:
+repo = 'gentoo'
+zero_in_degree = create_ebuild_dict(repo)
+with concurrent.futures.ThreadPoolExecutor(max_workers=os.cpu_count()) \
+as executor:
+for ebuild in zero_in_degree:
+# Let the executor run function call
+# update_for_deps_of(ebuild, zero_in_degree)
+if method == "pkgcore":
+executor.submit(update_for, ebuild, zero_in_degree, repo)
+else:
+executor.submit(update_for_deps_of, ebuild, zero_in_degree)
+
+# Print leaf ebuilds to standard output
+for ebuild in zero_in_degree:
+if zero_in_degree[ebuild]:
+print(ebuild)
+
+
+def update_for(ebuild: str, zero_in_degree: dict, repo: str) -> None:
+"""
+Update the boolean value for the specified ebuild in the given dictionary.
+Reverse dependencies of the ebuild will be searched in the specified
+repository only.
+"""
+print(f"Processing {ebuild} ...", file=sys.stderr)
+proc = subprocess.run(f'pquery --first --restrict-revdep ={ebuild} '
+  f'--repo {repo} --raw --unfiltered',
+  capture_output=True, text=True, shell=True)
+zero_in_degree[ebuild] = len(proc.stdout) == 0
+
+def create_ebuild_dict(repo: str) -> dict:
+"""
+Create a dictionary with all ebuilds in the specified repository as keys
+that maps each key to a boolean value indicating whether it is a leaf
+ebuild with zero in-degree.
+"""
+zero_in_degree = {}
+proc = subprocess.run(f'pquery --repo {repo} --raw --unfiltered',
+  capture_output=True, text=True,
+  shell=True, check=True)
+ebuilds = proc.stdout.splitlines()
+for ebuild in ebuilds:
+zero_in_degree[ebuild] = True
+return zero_in_degree
+
+
+def update_for_deps_of(ebuild: str, zero_in_degree: dict) -> None:
+"""
+For ebuilds that can be pulled as the specified ebuild's dependencies,
+update the boolean value for them in the given dictionary accordingly.
+"""
+
+def get_dep_atoms() -> list:
+"""
+Return a list of all dependency specification atoms.
+"""
+dep_atoms = []
+equery_dep_atom_pattern = re.compile(r'\(.+/.+\)')
+proc = subprocess.run(f'equery -CN depgraph -MUl {ebuild}',
+  capture_output=True, text=True, shell=True)
+out_lines = proc.stdout.splitlines()
+for line in out_lines:
+dep_atom_match = equery_dep_atom_pattern.findall(line)
+dep_atom = [dep.strip('()') for dep in dep_atom_match]
+dep_atoms.extend(dep_atom)
+return dep_atoms
+
+def find_matching_ebuilds(atom: str) -> list:
+"""
+Return a list of ebuilds that satisfy an atom.
+"""
+proc = subprocess.run(f"equery list -op -F '$cpv' '{atom}'",
+  capture_output=True, text=True, shell=True)
+return proc.stdout.splitlines()
+
+#print(f"Processing {ebuild} ...", file=sys.stderr)
+
+# Get dependency specifications in the ebuild;
+# equivalent to dep_graph[ebuild] in the examples above
+dep_atoms = get_dep_atoms()
+
+# Convert list of atoms to list of ebuilds that satisfy them
+dep_ebuilds = []
+for dep_atom in dep_atoms:
+dep_ebuilds.extend(find_matching_ebuilds(dep_atom))
+
+# Register dependency ebuilds as non-leaves
+for dep_ebuild in dep_ebuilds:
+# An ebuild in an overlay might depend on ebuilds from ::gentoo and/or
+# other repositories, but we only care about ebuilds in the dictionary
+# passed to this function
+if dep_ebuild in zero_in_degree:
+zero_in_degree[dep_ebuild] = False
+
+
+if __name__ == '__main__':
+main()
+

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

2022-07-16 Thread Sam James

commit: d4ae674f7a280c1f04ede58320c5c30ba31024c6
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 16 18:29:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 16 18:29:34 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d4ae674f

keyrings-export.bash: avoid ln -f (fix mismatched check)

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 0f36800..815c50b 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -46,9 +46,9 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
-   if [[ ! -L "${OUTPUT_DIR}"/keys/${key}.gpg ]] ; then
+   if [[ ! -L "${OUTPUT_DIR}"/${key}.gpg ]] ; then
# Compatibility symlink
-   ln -sf "${OUTPUT_DIR}"/keys/${key}.gpg 
"${OUTPUT_DIR}"/${key}.gpg
+   ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg
fi
 
timestamp=$(date -u +%Y%m%d -d "monday")

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

2022-07-16 Thread Sam James

commit: 2ca925941f5169b5acb05f976269cb8374aa0d86
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 16 18:28:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 16 18:29:05 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=2ca92594

keyrings-export.bash: fix infra-service-keys.gpg path

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 6b05d0d..0f36800 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -21,7 +21,7 @@ export -a INFRA_SYSTEM_KEYS=( $(grab_ldap_fingerprints -b 
"${SYSTEM_BASE}" "${IN
 export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \
"${SYSTEM_KEYS[@]}"
 
-export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg \
+export_keys "${OUTPUT_DIR}"/keys/infra-service-keys.gpg \
 "${INFRA_SYSTEM_KEYS[@]}"
 
 export_keys "${OUTPUT_DIR}"/keys/committing-devs.gpg \

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

2022-07-16 Thread John Helmert III

commit: b2e2cb0fbc3d90307b161b8396b9066a8210e53d
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Jul 16 18:25:27 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Jul 16 18:25:27 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=b2e2cb0f

keyrings-export: don't grab_keys

Signed-off-by: John Helmert III  gentoo.org>

 keyrings-export.bash | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 3eaf312..6b05d0d 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -21,7 +21,6 @@ export -a INFRA_SYSTEM_KEYS=( $(grab_ldap_fingerprints -b 
"${SYSTEM_BASE}" "${IN
 export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \
"${SYSTEM_KEYS[@]}"
 
-grab_keys "${INFRA_SYSTEM_KEYS[@]}"
 export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg \
 "${INFRA_SYSTEM_KEYS[@]}"

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

2022-07-16 Thread John Helmert III

commit: 000df6e17d844a754aa514309425b99b84dc3acc
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Jul 16 17:07:32 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Jul 16 17:07:32 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=000df6e1

keyrings-export: generate infra-service keyring

Signed-off-by: John Helmert III  gentoo.org>

 keyrings-export.bash | 5 +
 1 file changed, 5 insertions(+)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index dea52ac..3eaf312 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -16,10 +16,15 @@ export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b 
"${DEV_BASE}" "${COMMIT_
 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 -a INFRA_SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${INFRA_SYSTEM_RULE}") )
 
 export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \
"${SYSTEM_KEYS[@]}"
 
+grab_keys "${INFRA_SYSTEM_KEYS[@]}"
+export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg \
+"${INFRA_SYSTEM_KEYS[@]}"
+
 export_keys "${OUTPUT_DIR}"/keys/committing-devs.gpg \
"${COMMITTING_DEVS[@]}"

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

2022-07-16 Thread John Helmert III

commit: a21e419a55ab2b263e564459931f23fe9f17e4d1
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Jul 16 16:31:11 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Jul 16 16:31:11 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=a21e419a

create-dev-keyrings: correct export_keys call

Signed-off-by: John Helmert III  gentoo.org>

 create-dev-keyrings.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash
index 94af82a..3ab1b58 100755
--- a/create-dev-keyrings.bash
+++ b/create-dev-keyrings.bash
@@ -19,7 +19,8 @@ export_keys "${OUTPUT_DIR}"/service-keys.gpg \
"${SYSTEM_KEYS[@]}"
 
 grab_keys "${INFRA_SYSTEM_KEYS[@]}"
-export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg
+export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg \
+   "${INFRA_SYSTEM_KEYS[@]}"
 
 grab_keys "${COMMITTING_DEVS[@]}"
 export_keys "${OUTPUT_DIR}"/committing-devs.gpg \

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

2022-07-15 Thread John Helmert III

commit: 7da88ccd30ca360220a82f186fd822c27b6866cc
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Jul 16 04:21:41 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Jul 16 04:22:59 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=7da88ccd

keyrings-export: force creating compat symlinks

Infra is getting mails complaining that these symlinks already
exist. It's safe/easiest to just force them to be created.

Signed-off-by: John Helmert III  gentoo.org>

 keyrings-export.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 7445644..dea52ac 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -44,7 +44,7 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
if [[ ! -L "${OUTPUT_DIR}"/keys/${key}.gpg ]] ; then
# Compatibility symlink
-   ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg
+   ln -sf "${OUTPUT_DIR}"/keys/${key}.gpg 
"${OUTPUT_DIR}"/${key}.gpg
fi
 
timestamp=$(date -u +%Y%m%d -d "monday")

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

2022-07-15 Thread John Helmert III

commit: d76a48bc11b24d1a2a3ffd41c901f3881f48b624
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Jul 16 03:38:16 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Jul 16 03:38:16 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d76a48bc

create-dev-keyrings: also export infra service keys

Needed for glsamaker.

Signed-off-by: John Helmert III  gentoo.org>

 create-dev-keyrings.bash | 3 +++
 keyrings.inc.bash| 2 ++
 2 files changed, 5 insertions(+)

diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash
index d0ea12a..94af82a 100755
--- a/create-dev-keyrings.bash
+++ b/create-dev-keyrings.bash
@@ -18,6 +18,9 @@ grab_keys "${SYSTEM_KEYS[@]}"
 export_keys "${OUTPUT_DIR}"/service-keys.gpg \
"${SYSTEM_KEYS[@]}"
 
+grab_keys "${INFRA_SYSTEM_KEYS[@]}"
+export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg
+
 grab_keys "${COMMITTING_DEVS[@]}"
 export_keys "${OUTPUT_DIR}"/committing-devs.gpg \
"${COMMITTING_DEVS[@]}"

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 661dd36..9c2a23b 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -7,6 +7,7 @@ 
COMMIT_RULE='(&(gentooAccess=git.gentoo.org/repo/gentoo.git)(gentooStatus=active
 
NONCOMMIT_RULE='(&(!(gentooAccess=git.gentoo.org/repo/gentoo.git))(gentooStatus=active))'
 RETIRED_RULE='(!(gentooStatus=active))'
 INFRA_RULE='(&(gentooAccess=infra.group)(gentooStatus=active))'
+INFRA_SYSTEM_RULE='(&(gentooAccess=infra-system.group)(gentooStatus=active))'
 
 export KS_GENTOO=hkps://keys.gentoo.org/
 # Use local keyserver for speedup
@@ -134,4 +135,5 @@ export_ldap_data_to_env() {
export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
export -a INFRA_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${INFRA_RULE}") )
export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
+   export -a INFRA_SYSTEM_KEYS=( $(grab_ldap_fingerprints -b 
"${SYSTEM_BASE}" "${INFRA_SYSTEM_RULE}") )
 }

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

2022-07-10 Thread Sam James

commit: 89f4e8e0d6ce3be550ca01a8397763ad9efae9ca
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:41:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:41:59 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=89f4e8e0

keyrings-export.bash: use ${OUTPUT_DIR}

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index aee9af2..7445644 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -42,9 +42,9 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
-   if [[ ! -L keys/${key}.gpg ]] ; then
+   if [[ ! -L "${OUTPUT_DIR}"/keys/${key}.gpg ]] ; then
# Compatibility symlink
-   ln -s keys/${key}.gpg ${key}.gpg
+   ln -s "${OUTPUT_DIR}"/keys/${key}.gpg "${OUTPUT_DIR}"/${key}.gpg
fi
 
timestamp=$(date -u +%Y%m%d -d "monday")

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

2022-07-10 Thread Sam James

commit: deb5eca88bc5eae48fd36cdcb09a3dcb8e4629bc
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:26:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:26:03 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=deb5eca8

keyrings-export.bash: migrate keys into keys/

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index a890daf..aee9af2 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -17,24 +17,24 @@ export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b 
"${DEV_BASE}" "${NONC
 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 \
+export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \
"${SYSTEM_KEYS[@]}"
 
-export_keys "${OUTPUT_DIR}"/committing-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/committing-devs.gpg \
"${COMMITTING_DEVS[@]}"
 
-export_keys "${OUTPUT_DIR}"/active-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/active-devs.gpg \
"${COMMITTING_DEVS[@]}" \
"${NONCOMMITTING_DEVS[@]}"
 
-export_keys "${OUTPUT_DIR}"/infra-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/infra-devs.gpg \
"${INFRA_DEVS[@]}"
 
-export_keys "${OUTPUT_DIR}"/retired-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/retired-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 # Everybody together now
-export_keys "${OUTPUT_DIR}"/all-devs.gpg \
+export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \
"${SYSTEM_KEYS[@]}" \
"${COMMITTING_DEVS[@]}" \
"${NONCOMMITTING_DEVS[@]}" \
@@ -42,6 +42,11 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
+   if [[ ! -L keys/${key}.gpg ]] ; then
+   # Compatibility symlink
+   ln -s keys/${key}.gpg ${key}.gpg
+   fi
+
timestamp=$(date -u +%Y%m%d -d "monday")
 
# Don't clobber existing timestamped keys for this period (weekly)

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

2022-07-10 Thread Sam James

commit: 34dc0a6bfcc006a5c1d9d9fa7111fdb30d5a8ef4
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:08:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:08:47 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=34dc0a6b

keyrings-exports.bash: "next monday" -> "monday"

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index 6e4ade9..a890daf 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -42,7 +42,7 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
-   timestamp=$(date -u +%Y%m%d -d "next monday")
+   timestamp=$(date -u +%Y%m%d -d "monday")
 
# Don't clobber existing timestamped keys for this period (weekly)
# if we're running several times a day.

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

2022-07-10 Thread Sam James

commit: a9d640acbf75867a786cc50971521af8d95e921a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 01:00:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 01:00:07 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=a9d640ac

keyrings-export.bash: put key snapshots in /keys/ to avoid clutter

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index eea3f20..6e4ade9 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -46,11 +46,13 @@ for key in service-keys committing-devs active-devs 
infra-devs retired-devs all-
 
# Don't clobber existing timestamped keys for this period (weekly)
# if we're running several times a day.
-   if [[ -f "${OUTPUT_DIR}"/${key}-${timestamp}.gpg ]] ; then
+   if [[ -f "${OUTPUT_DIR}"/keys/${key}-${timestamp}.gpg ]] ; then
continue
fi
 
-   cp "${OUTPUT_DIR}"/${key}.gpg "${OUTPUT_DIR}"/${key}-${timestamp}.gpg
+   mkdir -p "${OUTPUT_DIR}"/keys
+
+   cp "${OUTPUT_DIR}"/${key}.gpg 
"${OUTPUT_DIR}"/keys/${key}-${timestamp}.gpg
 done
 
 clean_tmp

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

2022-07-10 Thread Sam James

commit: 915cc80e0bc0246a852613d3b07bde7dc9242cae
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 00:58:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 00:58:38 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=915cc80e

keyrings-export.bash: run snapshot part weekly

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index c9d4715..eea3f20 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -42,7 +42,7 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${RETIRED_DEVS[@]}"
 
 for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
-   timestamp=$(date +%Y%m%d)
+   timestamp=$(date -u +%Y%m%d -d "next monday")
 
# Don't clobber existing timestamped keys for this period (weekly)
# if we're running several times a day.

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

2022-07-10 Thread Sam James

commit: f8df7314768c5f5ee309ae63dcabd22442cce50b
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 11 00:52:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 00:52:56 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=f8df7314

keyrings-export.bash: make weekly snapshots of keyring exports

Needed for making a sec-keys/ package.

Signed-off-by: Sam James  gentoo.org>

 keyrings-export.bash | 12 
 1 file changed, 12 insertions(+)

diff --git a/keyrings-export.bash b/keyrings-export.bash
index f07df83..c9d4715 100755
--- a/keyrings-export.bash
+++ b/keyrings-export.bash
@@ -41,4 +41,16 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \
"${INFRA_DEVS[@]}" \
"${RETIRED_DEVS[@]}"
 
+for key in service-keys committing-devs active-devs infra-devs retired-devs 
all-devs ; do
+   timestamp=$(date +%Y%m%d)
+
+   # Don't clobber existing timestamped keys for this period (weekly)
+   # if we're running several times a day.
+   if [[ -f "${OUTPUT_DIR}"/${key}-${timestamp}.gpg ]] ; then
+   continue
+   fi
+
+   cp "${OUTPUT_DIR}"/${key}.gpg "${OUTPUT_DIR}"/${key}-${timestamp}.gpg
+done
+
 clean_tmp

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

2022-06-05 Thread Michał Górny

commit: 0d67a84cca32e7a3a335bb8d6483150006ed27b4
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jun  6 04:33:33 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jun  6 04:33:33 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0d67a84c

Bump pkgcheck2html

Signed-off-by: Michał Górny  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index f09e156..ac60b9e 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit f09e1564812cb9b6a5d828376fa509d51c380ad4
+Subproject commit ac60b9e4642f0895caaed7d81a6a4d38bd652fa9

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

2022-06-01 Thread Michał Górny

commit: 02b2faa0e18db7730377acdbde413c028352f12b
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jun  1 10:08:42 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun  1 10:08:42 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=02b2faa0

Bump pkgcheck2html

Signed-off-by: Michał Górny  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 3ed9660..f09e156 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 3ed9660cd86f0cd0a40ec16f9289c6d6a2d1dbcd
+Subproject commit f09e1564812cb9b6a5d828376fa509d51c380ad4

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

2022-05-16 Thread Michał Górny

commit: 34209a0d11ae33d80d18ad0551802bb185da1dcd
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 16 16:29:44 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 16 16:29:44 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=34209a0d

gpyutils: Remove support for obsolete tools

Signed-off-by: Michał Górny  gentoo.org>

 Makefile.gpyutils | 20 
 1 file changed, 20 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index c9f7e6f..eb355d8 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -20,26 +20,6 @@ all = $(upgr_all)
 
 all: $(all)
 
-$(outdir)/cands.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-cands > $@.new
-   mv $@.new $@
-
-$(outdir)/depcands.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-depcands > $@.new
-   mv $@.new $@
-
-$(outdir)/depcands-all.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-depcands --all > $@.new
-   mv $@.new $@
-
-$(outdir)/depcheck.txt: $(timestamp)
-   mkdir -p $(outdir)
-   gpy-depcheck > $@.new
-   mv $@.new $@
-
 $(outdir)/310-to-311.txt: $(timestamp)
mkdir -p $(outdir)
gpy-upgrade-impl -m python3_10 python3_11 > $@.new

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

2022-05-16 Thread Michał Górny

commit: 7c95afd9fc777a94a06ade155f4620ed6df1e9fa
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 16 16:12:28 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 16 16:12:28 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=7c95afd9

Remove non-existing py3.11 graph link

Signed-off-by: Michał Górny  gentoo.org>

 htdocs/index.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 4876851..d38cc56 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -125,9 +125,6 @@
 
 
   Py3.10 → 3.11 testing
-  
-svg
-  
  
   
   Generated artifacts

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

2022-05-16 Thread Michał Górny

commit: 7df3d4badf07dae29828c5012861ac45eab7c905
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 16 16:12:18 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 16 16:12:18 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=7df3d4ba

Remove obsolete py2 report links

Signed-off-by: Michał Górny  gentoo.org>

 htdocs/index.html | 6 --
 1 file changed, 6 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 40eb63f..4876851 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -129,12 +129,6 @@
 svg
   
  
-   
-  Py2-only packages
-  
-svg
-  
-
   
   Generated artifacts

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

2022-05-16 Thread Michał Górny

commit: 1cb8a117d3d5ae81e73398b0ab5b28fe7fc64e88
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 16 12:46:33 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 16 12:46:41 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=1cb8a117

Bump pkgcheck2html

Signed-off-by: Michał Górny  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 630048b..3ed9660 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 630048b8c486a72361e9f73f14d80614f804730c
+Subproject commit 3ed9660cd86f0cd0a40ec16f9289c6d6a2d1dbcd

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

2022-05-11 Thread Sam James

commit: 6b72ba0ea772a4437b1e8ff962efe5fc389fbc1f
Author: Sam James  gentoo  org>
AuthorDate: Wed May 11 20:34:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 11 20:34:43 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=6b72ba0e

Makefile.gpyutils: don't generate 3.11 graphs yet

Taken a day to generate these and still not done.

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 3eaeba4..c9f7e6f 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,14 +6,15 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # upgrades for stable impls
-upgr_base = $(outdir)/310-to-311.txt $(outdir)/39-to-310.txt 
$(outdir)/38-to-39.txt
+upgr_base = $(outdir)/39-to-310.txt $(outdir)/38-to-39.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
 upgr_txt = $(upgr_base) $(upgr_streq) $(outdir)/py2.txt
 upgr_dot = $(patsubst %.txt,%.dot,$(upgr_txt))
 upgr_svg = $(patsubst %.dot,%.svg,$(upgr_dot))
-upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg)
+# add new impls here if not stable yet, to avoid insanely huge generation times
+upgr_all = $(upgr_txt) $(upgr_dot) $(upgr_svg) $(outdir)/310-to-311.txt
 
 all = $(upgr_all)

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

2022-05-10 Thread Sam James

commit: 76acb7896fcf400c56decd170f398a75c6b2
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 22:00:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 10 22:00:57 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=76acb789

Makefile.gpyutils: fix typo

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 34d93af..3eaeba4 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -44,7 +44,7 @@ $(outdir)/310-to-311.txt: $(timestamp)
gpy-upgrade-impl -m python3_10 python3_11 > $@.new
mv $@.new $@
 
-$(outdir)/39-to-310-stablereq.txt: $(timestamp)
+$(outdir)/310-to-311-stablereq.txt: $(timestamp)
mkdir -p $(outdir)
gpy-upgrade-impl -m -s python3_10 python3_11 > $@.new
mv $@.new $@

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

2022-05-10 Thread Sam James

commit: 0e178cee8e359a69abdab408d3a36a1cac75ffb0
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 21:56:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 10 21:56:48 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0e178cee

Makefile.gpyutils: try harder to add Python 3.11

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 59fdfc3..34d93af 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -6,7 +6,7 @@ timestamp = $(PORTDIR)/metadata/timestamp.commit
 outdir = /dev/null
 
 # upgrades for stable impls
-upgr_base = $(outdir)/39-to-310.txt $(outdir)/38-to-39.txt
+upgr_base = $(outdir)/310-to-311.txt $(outdir)/39-to-310.txt 
$(outdir)/38-to-39.txt
 # related stabilizations
 upgr_streq = $(patsubst %.txt,%-stablereq.txt,$(upgr_base))
 # all upgrade stuff
@@ -44,6 +44,11 @@ $(outdir)/310-to-311.txt: $(timestamp)
gpy-upgrade-impl -m python3_10 python3_11 > $@.new
mv $@.new $@
 
+$(outdir)/39-to-310-stablereq.txt: $(timestamp)
+   mkdir -p $(outdir)
+   gpy-upgrade-impl -m -s python3_10 python3_11 > $@.new
+   mv $@.new $@
+
 $(outdir)/39-to-310.txt: $(timestamp)
mkdir -p $(outdir)
gpy-upgrade-impl -m python3_9 python3_10 > $@.new

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

2022-05-10 Thread Sam James

commit: 0d6fefe574a989c290a83bad2ab5498baf2f3e50
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 16:28:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 10 16:28:30 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0d6fefe5

Bump pkgcheck2html

Signed-off-by: Sam James  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 3704619..630048b 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 3704619bbfb31db09a2380fe1d918c18a05cca16
+Subproject commit 630048b8c486a72361e9f73f14d80614f804730c

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

2022-05-10 Thread Sam James

commit: 3abdac2d4e66d1647fd3a49753a6334a4a40fe45
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 16:28:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 10 16:28:13 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=3abdac2d

Makefile.gpyutils: add Python 3.10 -> Python 3.11

Signed-off-by: Sam James  gentoo.org>

 Makefile.gpyutils | 5 +
 1 file changed, 5 insertions(+)

diff --git a/Makefile.gpyutils b/Makefile.gpyutils
index 0379b03..59fdfc3 100644
--- a/Makefile.gpyutils
+++ b/Makefile.gpyutils
@@ -39,6 +39,11 @@ $(outdir)/depcheck.txt: $(timestamp)
gpy-depcheck > $@.new
mv $@.new $@
 
+$(outdir)/310-to-311.txt: $(timestamp)
+   mkdir -p $(outdir)
+   gpy-upgrade-impl -m python3_10 python3_11 > $@.new
+   mv $@.new $@
+
 $(outdir)/39-to-310.txt: $(timestamp)
mkdir -p $(outdir)
gpy-upgrade-impl -m python3_9 python3_10 > $@.new

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

2022-05-10 Thread Sam James

commit: c2a48851ce92b4824af158a6a866b130e9776c45
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 16:29:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 10 16:29:46 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=c2a48851

htdocs: add link to Python 3.10 -> Python 3.11 lists

Signed-off-by: Sam James  gentoo.org>

 htdocs/index.html | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index 14e5935..40eb63f 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -124,6 +124,12 @@
   
 
 
+  Py3.10 → 3.11 testing
+  
+svg
+  
+ 
+   
   Py2-only packages
   
 svg

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

2022-04-22 Thread Michał Górny

commit: 8a9f71b41829f17a76ac35f33e251f1c4f0ce6eb
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Apr 22 20:55:58 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr 22 20:56:20 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=8a9f71b4

Bump pkgcheck2html

Signed-off-by: Michał Górny  gentoo.org>

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 630048b..3704619 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 630048b8c486a72361e9f73f14d80614f804730c
+Subproject commit 3704619bbfb31db09a2380fe1d918c18a05cca16

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

2022-04-13 Thread Sam James

commit: 63bc12704fd23c11518299f1ebcb7aa200b22b38
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 13 06:19:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 13 06:19:11 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=63bc1270

htdocs: add 2020, 2021 bug links

Signed-off-by: Sam James  gentoo.org>

 htdocs/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index f6289de..14e5935 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -183,6 +183,8 @@
 https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2018-01-01=2017-01-01;
 class="list-group-item list-group-item-action">2017
 https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2019-01-01=2018-01-01;
 class="list-group-item list-group-item-action">2018
 https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2020-01-01=2019-01-01;
 class="list-group-item list-group-item-action">2019
+https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2021-01-01=2020-01-01;
 class="list-group-item list-group-item-action">2020
+https://bugs.gentoo.org/buglist.cgi?f1=delta_ts_id=1554870=lessthaneq=---=greaterthaneq_format=advanced=delta_ts=2022-01-01=2021-01-01;
 class="list-group-item list-group-item-action">2021

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

2022-04-10 Thread Robin H. Johnson

commit: 4332d6e6b5ac544c231e09a316e0ff1679d9cff5
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 10 15:44:31 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 10 15:46:17 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4332d6e6

keyrings-recv-keys.gentoo.org.bash: cleanup gpg agent

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

 keyrings.inc.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index b6ea0be..661dd36 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -79,6 +79,8 @@ push_keys() {
 
 export GPG_TMPDIR=''
 clean_tmp() {
+   # Ensure any agent is closed down
+   gpgconf --kill gpg-agent
[ -n "$GPG_TMPDIR" ] && [ -d "$GPG_TMPDIR" ] && rm -rf "$GPG_TMPDIR"
 }
 setup_tmp() {

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

2022-04-10 Thread Robin H. Johnson

commit: 0db8cdfb85d8449cf38e3172c235e743bbc0614a
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Apr 10 15:44:16 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Apr 10 15:46:17 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=0db8cdfb

keyrings-recv-keys.gentoo.org.bash: drop duplicate export_ldap_data_to_env 
content

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

 keyrings-recv-keys.gentoo.org.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyrings-recv-keys.gentoo.org.bash 
b/keyrings-recv-keys.gentoo.org.bash
index 640063e..7cc1b62 100755
--- a/keyrings-recv-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -7,7 +7,9 @@ DEBUG=${DEBUG:=0}
 source "${BASEDIR}"/keyrings.inc.bash
 
 set -e
-export_ldap_data_to_env
+
+# export_ldap_data_to_env
+# TODO: for unclear reason this does not populate correctly inside a function
 export -a COMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${COMMIT_RULE}") )
 export -a INFRA_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${INFRA_RULE}") )
 export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${NONCOMMIT_RULE}") )

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

2022-03-19 Thread Sam James

commit: ba92bba77ba90ede141ee48fdaa0caff6813ea8c
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 22:17:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 22:18:14 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ba92bba7

htdocs/index.html: update link to new eapi-usage/ directory

Contains STATS.txt for the old content but also per-EAPI files
listing ebuilds.

Signed-off-by: Sam James  gentoo.org>

 htdocs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 3652d33..f6289de 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -143,7 +143,7 @@
 
   Tree-wide Scanning
   
-EAPI Usage
+EAPI Usage
 EAPI Usage per eclass
 Eclass-EAPI usage matrix
 Invalid package.mask entries

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

2022-03-19 Thread Sam James

commit: 59268f29b296634f73248a0e93087d4352024471
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 20:34:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 20:34:17 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=59268f29

eapi-usage.sh: drop errant  from STATS

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 81a7f91..e4b65b2 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -78,7 +78,6 @@ find "${REPO_PATH}"/metadata/md5-cache -type f ! -name '*.gz' 
\
 
 echo >> ${stats}
 echo "Date generated: $(date -u '+%Y-%m-%d %H:%M:%S %Z')" >> ${stats}
-echo "" >> ${stats}
 
 echo "" > ${dir}/README.html
 cat ${stats} >> ${dir}/README.html

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

2022-03-19 Thread Sam James

commit: 6713ed040f6b13027371a4bec14b300ae13def28
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 20:29:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 20:29:42 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=6713ed04

eapi-usage.sh: fix clobbering README/STATS

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 3ec8c8e..81a7f91 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -76,9 +76,9 @@ find "${REPO_PATH}"/metadata/md5-cache -type f ! -name '*.gz' 
\
printf "total:  %7d ebuilds\n", NR
 }' > ${stats}
 
-echo > ${stats}
-echo "Date generated: $(date -u '+%Y-%m-%d %H:%M:%S %Z')" > ${stats}
-echo "" > ${stats}
+echo >> ${stats}
+echo "Date generated: $(date -u '+%Y-%m-%d %H:%M:%S %Z')" >> ${stats}
+echo "" >> ${stats}
 
 echo "" > ${dir}/README.html
 cat ${stats} >> ${dir}/README.html

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

2022-03-19 Thread Sam James

commit: 5445f9de7360e13a86fb14e145cb257349ed0bbb
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 20:25:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 20:26:06 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=5445f9de

eapi-usage.sh; drop set -x

Was added for debugging.

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 75aa5d4..3ec8c8e 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -4,7 +4,6 @@
 # Arguments:
 # $1: output directory. Defaults to eapi-usage.
 # $2: file to place stats in within $1.
-set -x
 . /lib/gentoo/functions.sh
 
 dir=${1}

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

2022-03-19 Thread Sam James

commit: c921cb304f22ca8dccbdbcea8303d045e47ff04f
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 20:22:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 20:22:12 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=c921cb30

eapi-usage.sh: write STATS.txt in eapi-usage/

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 29 +++--
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index e6fa711..75aa5d4 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
 # This script respects EINFO_QUIET=1 etc to silence stdout
+# Always puts a summary in $1/README.html.
 # Arguments:
 # $1: output directory. Defaults to eapi-usage.
-
+# $2: file to place stats in within $1.
+set -x
 . /lib/gentoo/functions.sh
+
 dir=${1}
+
 if [[ -n ${1} && -e ${dir} && ! -d ${dir} ]] ; then
eerror "Output directory given (${dir}) is not a directory! Exiting."
exit 1
@@ -13,14 +17,15 @@ elif [[ -z ${dir} ]] ; then
dir=eapi-usage
 fi
 
-REPO_PATH=$(portageq get_repo_path ${EROOT:-/} gentoo || exit 1)
-
-shopt -s nullglob
+stats=${2:-$dir/STATS.txt}
 
 mkdir -p ${dir} || exit 1
 
+REPO_PATH=$(portageq get_repo_path ${EROOT:-/} gentoo || exit 1)
 TMPDIR="$(mktemp -d || exit 1)"
 
+shopt -s nullglob
+
 einfo "Working in TMPDIR=${TMPDIR}"
 pushd "${TMPDIR}" &>/dev/null || exit 1
 mkdir -p eapi-usage || exit 1
@@ -45,7 +50,8 @@ done || { eend $? || exit 1; }
 eend $?
 
 popd &>/dev/null || exit 1
-rm ${dir}/*.txt || exit 1
+# No exit here because it's fine if we removed nothing
+rm ${dir}/*.txt
 mv ${TMPDIR}/eapi-usage/*.txt ${dir}/ || exit 1
 
 rm -r "${TMPDIR}" || exit 1
@@ -57,7 +63,6 @@ rm -r "${TMPDIR}" || exit 1
 #[[ $(type pinspect 2> /dev/null) ]] || exit 1
 #
 #pinspect eapi_usage /usr/portage
-echo ""
 find "${REPO_PATH}"/metadata/md5-cache -type f ! -name '*.gz' \
   -exec grep -h '^EAPI=' '{}' + \
   | awk '
@@ -70,8 +75,12 @@ find "${REPO_PATH}"/metadata/md5-cache -type f ! -name 
'*.gz' \
i, eapi[i], eapi[i]*100.0/NR, s
}
printf "total:  %7d ebuilds\n", NR
-}'
+}' > ${stats}
+
+echo > ${stats}
+echo "Date generated: $(date -u '+%Y-%m-%d %H:%M:%S %Z')" > ${stats}
+echo "" > ${stats}
 
-echo
-echo "Date generated: $(date -u '+%Y-%m-%d %H:%M:%S %Z')"
-echo ""
+echo "" > ${dir}/README.html
+cat ${stats} >> ${dir}/README.html
+echo "" >> ${dir}/README.html

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

2022-03-19 Thread Sam James

commit: eb458e1476163018d22cfe56de0625a5dd29d949
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 20:01:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 20:01:45 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=eb458e14

eapi-usage.sh: cleanup old EAPI results

This means we don't have stale-files lingering once all
ebuilds using an EAPI are removed.

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 1366d8f..e6fa711 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -45,6 +45,7 @@ done || { eend $? || exit 1; }
 eend $?
 
 popd &>/dev/null || exit 1
+rm ${dir}/*.txt || exit 1
 mv ${TMPDIR}/eapi-usage/*.txt ${dir}/ || exit 1
 
 rm -r "${TMPDIR}" || exit 1

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

2022-03-19 Thread Sam James

commit: 09fed52cac77648e93d310a2de57546441a94540
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 19:52:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 19:53:19 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=09fed52c

eapi-usage.sh: add note about EINFO_QUIET

We use gentoo-functions' bits so we respect EINFO_QUIET. Note
this in a comment as not everybody will know this.

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 77758bd..7dc6e7d 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# This script respects EINFO_QUIET=1 etc to silence stdout
 # Arguments:
 # $1: output directory. Defaults to eapi-usage.

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

2022-03-19 Thread Sam James

commit: d615f2c860f3121fa028d08191ad21f3202d04ff
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 19:54:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 19:54:08 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=d615f2c8

eapi-usage.sh: fully respect ${REPO_PATH}

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 7dc6e7d..8706fb8 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -65,7 +65,7 @@ rm -r "${TMPDIR}" || exit 1
 #
 #pinspect eapi_usage /usr/portage
 echo ""
-find /usr/portage/metadata/md5-cache -type f ! -name '*.gz' \
+find "${REPO_PATH}"/metadata/md5-cache -type f ! -name '*.gz' \
   -exec grep -h '^EAPI=' '{}' + \
   | awk '
 { sub("EAPI=",""); eapi[$1]++ }

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

2022-03-19 Thread Sam James

commit: 555b795d6313fbda8c94429377b05341effc8577
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 19:59:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 20:00:52 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=555b795d

eapi-usage.sh: only list EAPIs seen in tree

Means we avoid e.g. EAPI 0 but also EAPIs never in ::gentoo
like 5-progress.

Much less noisy, anyway.

Signed-off-by: Sam James  gentoo.org>

 eapi-usage.sh | 18 +-
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/eapi-usage.sh b/eapi-usage.sh
index 8706fb8..1366d8f 100755
--- a/eapi-usage.sh
+++ b/eapi-usage.sh
@@ -15,12 +15,9 @@ fi
 
 REPO_PATH=$(portageq get_repo_path ${EROOT:-/} gentoo || exit 1)
 
-mkdir -p ${dir} || exit 1
+shopt -s nullglob
 
-ebegin "Getting list of supported EAPIs"
-eapi_list=$(python3 -c 'import portage.repository.config; 
print("\n".join(list(portage._supported_eapis)))' || exit 1)
-eend $?
-einfo "EAPI list:" ${eapi_list}
+mkdir -p ${dir} || exit 1
 
 TMPDIR="$(mktemp -d || exit 1)"
 
@@ -29,11 +26,6 @@ pushd "${TMPDIR}" &>/dev/null || exit 1
 mkdir -p eapi-usage || exit 1
 cd eapi-usage || exit 1
 
-for eapi in ${eapi_list[@]} ; do
-   [[ -f ${eapi}.txt ]] && rm -r ${eapi}.txt
-   touch ${eapi}.txt
-done
-
 ebegin "Finding ebuilds"
 (
for ebuild in $(find "${REPO_PATH}/metadata/md5-cache" -mindepth 2 
-maxdepth 2 -type f -name '*-[0-9]*') ; do
@@ -46,9 +38,9 @@ ebegin "Finding ebuilds"
 eend ${?}
 
 ebegin "Sorting EAPI files"
-for eapi in ${eapi_list[@]} ; do
-   sort -u ${eapi}.txt > ${eapi}.txt.sorted
-   mv ${eapi}.txt.sorted ${eapi}.txt
+for eapi in *.txt ; do
+   sort -u ${eapi} > ${eapi}.sorted
+   mv ${eapi}.sorted ${eapi}
 done || { eend $? || exit 1; }
 eend $?

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

2022-03-19 Thread Sam James

commit: 4dae15d9b786650329fa92f9a7ddc0116e6f5acc
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 19:43:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 19:43:07 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4dae15d9

eapi-usage.sh: rename from eapi_usage.sh; absorb check-eapis.sh

Both eapi_usage.sh and check-eapis.sh do very similar things,
so let's combine the two.

Signed-off-by: Sam James  gentoo.org>

 check-eapis.sh => eapi-usage.sh | 26 ++
 eapi_usage.sh   | 27 ---
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/check-eapis.sh b/eapi-usage.sh
similarity index 64%
rename from check-eapis.sh
rename to eapi-usage.sh
index 78fa30a..77758bd 100755
--- a/check-eapis.sh
+++ b/eapi-usage.sh
@@ -55,3 +55,29 @@ popd &>/dev/null || exit 1
 mv ${TMPDIR}/eapi-usage/*.txt ${dir}/ || exit 1
 
 rm -r "${TMPDIR}" || exit 1
+
+# Now generate the numbers/summary (copied in from previous eapi_usage.sh 
script)
+# Boring 'script' that just uses pkgcore's pinspect command. Someday it would 
be
+# nice to graph this output, or maybe keep some running history?
+
+#[[ $(type pinspect 2> /dev/null) ]] || exit 1
+#
+#pinspect eapi_usage /usr/portage
+echo ""
+find /usr/portage/metadata/md5-cache -type f ! -name '*.gz' \
+  -exec grep -h '^EAPI=' '{}' + \
+  | awk '
+{ sub("EAPI=",""); eapi[$1]++ }
+END {
+  PROCINFO["sorted_in"]="@val_num_desc"
+  for (i in eapi) {
+s=""; for (j=1; j"

diff --git a/eapi_usage.sh b/eapi_usage.sh
deleted file mode 100755
index 94bdfcb..000
--- a/eapi_usage.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Boring 'script' that just uses pkgcore's pinspect command. Someday it would 
be
-# nice to graph this output, or maybe keep some running history?
-
-#[[ $(type pinspect 2> /dev/null) ]] || exit 1
-#
-#pinspect eapi_usage /usr/portage
-
-echo ""
-find /usr/portage/metadata/md5-cache -type f ! -name '*.gz' \
-  -exec grep -h '^EAPI=' '{}' + \
-  | awk '
-{ sub("EAPI=",""); eapi[$1]++ }
-END {
-  PROCINFO["sorted_in"]="@val_num_desc"
-  for (i in eapi) {
-s=""; for (j=1; j"

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

2022-03-19 Thread Sam James

commit: fe912438df94fbf1b26b297ed287e1527c60a263
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 19:40:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 19:40:44 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=fe912438

eapi_usage.sh: add  tags to output for use in README.html in eapi-usage/

Signed-off-by: Sam James  gentoo.org>

 eapi_usage.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eapi_usage.sh b/eapi_usage.sh
index a4a47ac..94bdfcb 100755
--- a/eapi_usage.sh
+++ b/eapi_usage.sh
@@ -7,6 +7,7 @@
 #
 #pinspect eapi_usage /usr/portage
 
+echo ""
 find /usr/portage/metadata/md5-cache -type f ! -name '*.gz' \
   -exec grep -h '^EAPI=' '{}' + \
   | awk '
@@ -23,3 +24,4 @@ find /usr/portage/metadata/md5-cache -type f ! -name '*.gz' \
 
 echo
 echo "Date generated: $(date -u '+%Y-%m-%d %H:%M:%S %Z')"
+echo ""

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

2022-03-19 Thread Sam James

commit: 54a596d58eabec34fe6c8fa85ea86ccee98efb0e
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 19:34:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 19:34:38 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=54a596d5

check-eapis.sh: fix bailout-if-not-dir check

We only want to quit if it's been given and is not a dir but does exist.

Signed-off-by: Sam James  gentoo.org>

 check-eapis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check-eapis.sh b/check-eapis.sh
index cfd58a1..78fa30a 100755
--- a/check-eapis.sh
+++ b/check-eapis.sh
@@ -4,7 +4,7 @@
 
 . /lib/gentoo/functions.sh
 dir=${1}
-if [[ -n ${1} && ! -d ${dir} ]] ; then
+if [[ -n ${1} && -e ${dir} && ! -d ${dir} ]] ; then
eerror "Output directory given (${dir}) is not a directory! Exiting."
exit 1
 elif [[ -z ${dir} ]] ; then

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

2022-03-19 Thread Sam James

commit: 4484c577af41785358982daf4829f71091207567
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 18:48:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 18:52:15 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4484c577

check-eapis.sh: new script to list each ebuild using each EAPI

Signed-off-by: Sam James  gentoo.org>

 check-eapis.sh | 57 +
 1 file changed, 57 insertions(+)

diff --git a/check-eapis.sh b/check-eapis.sh
new file mode 100755
index 000..cfd58a1
--- /dev/null
+++ b/check-eapis.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+# Arguments:
+# $1: output directory. Defaults to eapi-usage.
+
+. /lib/gentoo/functions.sh
+dir=${1}
+if [[ -n ${1} && ! -d ${dir} ]] ; then
+   eerror "Output directory given (${dir}) is not a directory! Exiting."
+   exit 1
+elif [[ -z ${dir} ]] ; then
+   ewarn "No output directory argument given! Defaulting to 'eapi-usage'."
+   dir=eapi-usage
+fi
+
+REPO_PATH=$(portageq get_repo_path ${EROOT:-/} gentoo || exit 1)
+
+mkdir -p ${dir} || exit 1
+
+ebegin "Getting list of supported EAPIs"
+eapi_list=$(python3 -c 'import portage.repository.config; 
print("\n".join(list(portage._supported_eapis)))' || exit 1)
+eend $?
+einfo "EAPI list:" ${eapi_list}
+
+TMPDIR="$(mktemp -d || exit 1)"
+
+einfo "Working in TMPDIR=${TMPDIR}"
+pushd "${TMPDIR}" &>/dev/null || exit 1
+mkdir -p eapi-usage || exit 1
+cd eapi-usage || exit 1
+
+for eapi in ${eapi_list[@]} ; do
+   [[ -f ${eapi}.txt ]] && rm -r ${eapi}.txt
+   touch ${eapi}.txt
+done
+
+ebegin "Finding ebuilds"
+(
+   for ebuild in $(find "${REPO_PATH}/metadata/md5-cache" -mindepth 2 
-maxdepth 2 -type f -name '*-[0-9]*') ; do
+   cpf=$(echo ${ebuild} | rev | cut -d/ -f1-2 | rev)
+   eapi=$(grep -oi "eapi=.*" ${ebuild} | sed -e 's:EAPI=::')
+
+   echo "${cpf}" >> ${eapi}.txt
+   done
+) || { eend $? || exit 1; }
+eend ${?}
+
+ebegin "Sorting EAPI files"
+for eapi in ${eapi_list[@]} ; do
+   sort -u ${eapi}.txt > ${eapi}.txt.sorted
+   mv ${eapi}.txt.sorted ${eapi}.txt
+done || { eend $? || exit 1; }
+eend $?
+
+popd &>/dev/null || exit 1
+mv ${TMPDIR}/eapi-usage/*.txt ${dir}/ || exit 1
+
+rm -r "${TMPDIR}" || exit 1

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

2022-03-19 Thread Sam James

commit: c3638d2240dce9c4c65a547e5371f7b49c426912
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 14 22:45:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 14 22:52:00 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=c3638d22

check_eclasses_eapis.sh: respect ${EROOT}

Signed-off-by: Sam James  gentoo.org>

 check_eclasses_eapis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_eclasses_eapis.sh b/check_eclasses_eapis.sh
index 31a2bbb..899b1c3 100755
--- a/check_eclasses_eapis.sh
+++ b/check_eclasses_eapis.sh
@@ -14,7 +14,7 @@ fi
 
 TMPEAPIS="$(mktemp -t $(basename $0).global.tmp.XX)"
 TMPECLASS="$(mktemp -t $(basename $0).eclass.tmp.XX)"
-REPO_PATH=$(portageq get_repo_path / gentoo)
+REPO_PATH=$(portageq get_repo_path ${EROOT:-/} gentoo)
 pushd "${REPO_PATH}/eclass" > /dev/null
 ECLASSES=$(echo *.eclass)
 popd > /dev/null

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

2022-03-19 Thread Sam James

commit: efc4271cb8c62dd0f20dbfe18dab84646e8c9c4c
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 14 22:44:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 14 22:51:37 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=efc4271c

check_eclasses_eapis.sh: use mktemp

Means we respect TMPDIR.

Signed-off-by: Sam James  gentoo.org>

 check_eclasses_eapis.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/check_eclasses_eapis.sh b/check_eclasses_eapis.sh
index 3a0fc07..31a2bbb 100755
--- a/check_eclasses_eapis.sh
+++ b/check_eclasses_eapis.sh
@@ -12,8 +12,8 @@ fi
 #[[ $(type pquery 2> /dev/null) ]] || exit 1
 [[ $(type gawk 2> /dev/null) ]] || exit 1
 
-TMPEAPIS="/tmp/$(basename $0).global.$$.tmp"
-TMPECLASS="/tmp/$(basename $0).eclass.$$.tmp"
+TMPEAPIS="$(mktemp -t $(basename $0).global.tmp.XX)"
+TMPECLASS="$(mktemp -t $(basename $0).eclass.tmp.XX)"
 REPO_PATH=$(portageq get_repo_path / gentoo)
 pushd "${REPO_PATH}/eclass" > /dev/null
 ECLASSES=$(echo *.eclass)

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

2022-03-13 Thread Sam James

commit: c193364d2e02c2615b207fd6919e15541c2ac8b4
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 13 20:52:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 13 20:52:38 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=c193364d

check_eclasses_eapis.sh: needs gawk, not any awk

Signed-off-by: Sam James  gentoo.org>

 check_eclasses_eapis.sh | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/check_eclasses_eapis.sh b/check_eclasses_eapis.sh
index 76c332b..3a0fc07 100755
--- a/check_eclasses_eapis.sh
+++ b/check_eclasses_eapis.sh
@@ -10,6 +10,7 @@ else
 fi
 
 #[[ $(type pquery 2> /dev/null) ]] || exit 1
+[[ $(type gawk 2> /dev/null) ]] || exit 1
 
 TMPEAPIS="/tmp/$(basename $0).global.$$.tmp"
 TMPECLASS="/tmp/$(basename $0).eclass.$$.tmp"
@@ -19,7 +20,7 @@ ECLASSES=$(echo *.eclass)
 popd > /dev/null
 
 #pquery --attr eapi --attr inherited --raw --all --repo portdir > "${TMPEAPIS}"
-find "${REPO_PATH}/metadata/md5-cache" -type f -name '*-[0-9]*' -exec awk -F= '
+find "${REPO_PATH}/metadata/md5-cache" -type f -name '*-[0-9]*' -exec gawk -F= 
'
BEGINFILE {
n = split(FILENAME, f, "/")
file = f[n-1] "/" f[n]
@@ -38,7 +39,7 @@ find "${REPO_PATH}/metadata/md5-cache" -type f -name 
'*-[0-9]*' -exec awk -F= '
}
' '{}' \+ > "${TMPEAPIS}"
 
-KNOWN_EAPIS=$(awk '
+KNOWN_EAPIS=$(gawk '
{ e = gensub(/eapi="(.*)"/, "\\1", "", $2); eapi[e] = e }
END { PROCINFO["sorted_in"]="@ind_num_asc"; for (e in eapi) print e }
' "${TMPEAPIS}")
@@ -49,11 +50,11 @@ for x in ${ECLASSES}; do
echo "Processing eclass \"${x}\""
rm -rf "${x}"
mkdir "${x}"
-   awk -F'=' '$3 ~ /[ "]'"${x%.eclass}"'[ "]/ {print $1" "$2}' 
"${TMPEAPIS}" > "${TMPECLASS}"
+   gawk -F'=' '$3 ~ /[ "]'"${x%.eclass}"'[ "]/ {print $1" "$2}' 
"${TMPEAPIS}" > "${TMPECLASS}"
pushd "${x}" > /dev/null
echo "Overall statistics for eclass \"${x}\":" > "STATS.txt"
for y in ${KNOWN_EAPIS}; do
-   awk -F ' ' '$3 ~ /"'"${y}"'"/ {print $1}' "${TMPECLASS}" > 
"${y}.txt"
+   gawk -F ' ' '$3 ~ /"'"${y}"'"/ {print $1}' "${TMPECLASS}" > 
"${y}.txt"
tmpval=$(wc -l "${y}.txt" |cut -d' ' -f1)
echo "EAPI=${y} count: ${tmpval}" >> "STATS.txt"
done

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

2022-03-13 Thread Sam James

commit: a607e1af368a7d2b7f2d4ab088b40e129401f0c6
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 13 18:12:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 13 18:12:46 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=a607e1af

check_eclasses_eapis.sh: minor phrasing tweak

Signed-off-by: Sam James  gentoo.org>

 check_eclasses_eapis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_eclasses_eapis.sh b/check_eclasses_eapis.sh
index 56e2a1b..76c332b 100755
--- a/check_eclasses_eapis.sh
+++ b/check_eclasses_eapis.sh
@@ -51,7 +51,7 @@ for x in ${ECLASSES}; do
mkdir "${x}"
awk -F'=' '$3 ~ /[ "]'"${x%.eclass}"'[ "]/ {print $1" "$2}' 
"${TMPEAPIS}" > "${TMPECLASS}"
pushd "${x}" > /dev/null
-   echo "Overall statistic for eclass \"${x}\":" > "STATS.txt"
+   echo "Overall statistics for eclass \"${x}\":" > "STATS.txt"
for y in ${KNOWN_EAPIS}; do
awk -F ' ' '$3 ~ /"'"${y}"'"/ {print $1}' "${TMPECLASS}" > 
"${y}.txt"
tmpval=$(wc -l "${y}.txt" |cut -d' ' -f1)

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

2022-03-06 Thread Robin H. Johnson

commit: 105bf2773bf6c22ab6867a9069dbfa5196d8bbe6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Mar  6 17:30:29 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Mar  6 17:30:29 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=105bf277

keyrings-recv-keys.gentoo.org.bash: remove obsolete comment

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

 keyrings-recv-keys.gentoo.org.bash | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/keyrings-recv-keys.gentoo.org.bash 
b/keyrings-recv-keys.gentoo.org.bash
index 5f35fcf..640063e 100755
--- a/keyrings-recv-keys.gentoo.org.bash
+++ b/keyrings-recv-keys.gentoo.org.bash
@@ -1,8 +1,5 @@
 #!/bin/bash
 # Import key updates from Keyservers: keys.gentoo.org
-#
-# TODO:
-# - Turn off export in this script
 
 BASEDIR="$(dirname "$0")"
 DEBUG=${DEBUG:=0}

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

2022-03-06 Thread Robin H. Johnson

commit: db9e494bc501a30e46cfeebe5e64f8f66372d620
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Mar  6 17:27:28 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Mar  6 17:27:28 2022 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=db9e494b

keyrings: increase grab timeout

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

 keyrings.inc.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyrings.inc.bash b/keyrings.inc.bash
index 7989d79..b6ea0be 100644
--- a/keyrings.inc.bash
+++ b/keyrings.inc.bash
@@ -35,7 +35,7 @@ grab_keys() {
local missing=()
local remaining=( "${@}" )
 
-   KEYSERVER_TIMEOUT=${KEYSERVER_TIMEOUT:=1m}
+   KEYSERVER_TIMEOUT=${KEYSERVER_TIMEOUT:=2m}
# quickly handle empty keyservers set
[ "${#KEYSERVERS[@]}" -eq 0 ] && return
while :; do

1 2 3 4 >

1 - 100 of 394 matches

Mail list logo