aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2023-09-19 20:15:30 +0200
committerMike Gilbert <floppym@gentoo.org>2023-09-20 14:02:20 -0400
commit03489ca1880d4429c18cf7da2ed27ae65a21510b (patch)
tree209a4f3ca3ab14c5b5009813f2365eb23cbf3b4c
parentmake.globals: default-on FEATURES=pkgdir-index-trusted (diff)
downloadportage-03489ca1.tar.gz
portage-03489ca1.tar.bz2
portage-03489ca1.zip
Catch error when trust helper is not found
Closes: https://github.com/gentoo/portage/pull/1097 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--lib/portage/dbapi/bintree.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index 9d7c45577..42912b2eb 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -1245,7 +1245,17 @@ class binarytree:
portage_trust_helper = self.settings.get("PORTAGE_TRUST_HELPER", "")
if portage_trust_helper == "":
return
- ret = subprocess.run(portage_trust_helper)
+ try:
+ ret = subprocess.run(portage_trust_helper)
+ except FileNotFoundError:
+ writemsg(
+ _(
+ "\n!!! Portage trust helper %s for binary packages not found\n!!! Continuing, but did you install app-portage/getuto?\n"
+ )
+ % portage_trust_helper,
+ noiselevel=-1,
+ )
+ return
ret.check_returncode()
def _populate_remote(self, getbinpkg_refresh=True):