commit: 387b50c08ef14c56f9b886e9300f0688e9d9f2d8
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 18:59:48 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 18:59:48 2025 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=387b50c0
lucky builders: upgrade from eix to pkgcore for filtering installable packages
In pkgcore 0.12.29, Arthur added some desperately needed functionality
for scripters. This means we can now do much the same thing that eix
did, but with pquery. There's one particularly big difference between
the two though, which is that when pquery lists stable packages, it does
it as a *visibility* check, which means it also filters out packages
which aren't in our ACCEPT_LICENSE.
This means we spend less time having binhost runs attempt to install
something with an incompatible license and fail that "lucky" run
entirely (and with the current implementation, giving up that job slot
for the day).
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
builders/dola/gnome-23/run-update | 5 ++---
builders/dola/kde-23/run-update | 5 ++---
builders/dola/server-23/run-update | 5 ++---
builders/milou/gnome-23/run-update | 5 ++---
builders/milou/gnome-v3-23/run-update | 5 ++---
builders/milou/kde-23/run-update | 5 ++---
builders/milou/kde-v3-23/run-update | 5 ++---
builders/milou/openrc-23/run-update | 5 ++---
builders/milou/openrc-v3-23/run-update | 5 ++---
builders/milou/server-23/run-update | 5 ++---
builders/milou/server-v3-23/run-update | 5 ++---
11 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/builders/dola/gnome-23/run-update
b/builders/dola/gnome-23/run-update
index 2977128..e2eef5b 100755
--- a/builders/dola/gnome-23/run-update
+++ b/builders/dola/gnome-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/dola/kde-23/run-update b/builders/dola/kde-23/run-update
index 2977128..e2eef5b 100755
--- a/builders/dola/kde-23/run-update
+++ b/builders/dola/kde-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/dola/server-23/run-update
b/builders/dola/server-23/run-update
index 2977128..e2eef5b 100755
--- a/builders/dola/server-23/run-update
+++ b/builders/dola/server-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/gnome-23/run-update
b/builders/milou/gnome-23/run-update
index 0c8fceb..7c0c5c7 100755
--- a/builders/milou/gnome-23/run-update
+++ b/builders/milou/gnome-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/gnome-v3-23/run-update
b/builders/milou/gnome-v3-23/run-update
index 0c8fceb..7c0c5c7 100755
--- a/builders/milou/gnome-v3-23/run-update
+++ b/builders/milou/gnome-v3-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/kde-23/run-update b/builders/milou/kde-23/run-update
index 0c8fceb..7c0c5c7 100755
--- a/builders/milou/kde-23/run-update
+++ b/builders/milou/kde-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/kde-v3-23/run-update
b/builders/milou/kde-v3-23/run-update
index 0c8fceb..7c0c5c7 100755
--- a/builders/milou/kde-v3-23/run-update
+++ b/builders/milou/kde-v3-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/openrc-23/run-update
b/builders/milou/openrc-23/run-update
index 0c8fceb..7c0c5c7 100755
--- a/builders/milou/openrc-23/run-update
+++ b/builders/milou/openrc-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/openrc-v3-23/run-update
b/builders/milou/openrc-v3-23/run-update
index 0c8fceb..7c0c5c7 100755
--- a/builders/milou/openrc-v3-23/run-update
+++ b/builders/milou/openrc-v3-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/server-23/run-update
b/builders/milou/server-23/run-update
index 2977128..e2eef5b 100755
--- a/builders/milou/server-23/run-update
+++ b/builders/milou/server-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
diff --git a/builders/milou/server-v3-23/run-update
b/builders/milou/server-v3-23/run-update
index 2977128..e2eef5b 100755
--- a/builders/milou/server-v3-23/run-update
+++ b/builders/milou/server-v3-23/run-update
@@ -6,9 +6,8 @@ set -e
to_install=(world)
if [[ $1 = *lucky ]]; then
- eix-update
- eix --stable --only-names | grep -E -v '^(acct|virtual|sec)-' | sort -u
> /tmp/stable
- eix --installed --only-names | sort -u > /tmp/installed
+ pquery -F '{category}/{package}' --max -r gentoo | grep -E -v
'^(acct|virtual|sec)-' | sort -u > /tmp/stable
+ pquery --installed -F '{category}/{package}' | sort -u > /tmp/installed
comm -23 /tmp/stable /tmp/installed > /tmp/uninstalled-stable
sed -i 's/--binpkg-respect-use//' /etc/portage/make.conf
