commit: 0009404ee5f293fe7076d59a52c46827c3b77738 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Nov 26 17:43:45 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 26 17:43:45 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0009404e
dbapi: fix logic in bintree.binarytree._parse_build_id() Resolves an error when improperly named xpak files exist in PKGDIR. Bug: https://bugs.gentoo.org/818886 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> lib/portage/dbapi/bintree.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py index 777fc4918..9dbf9ee8b 100644 --- a/lib/portage/dbapi/bintree.py +++ b/lib/portage/dbapi/bintree.py @@ -1877,11 +1877,10 @@ class binarytree: suffixlen = len(".xpak") hyphen = filename.rfind("-", 0, -(suffixlen + 1)) if hyphen != -1: - build_id = filename[hyphen + 1 : -suffixlen] - try: - build_id = int(build_id) - except ValueError: - pass + try: + build_id = int(filename[hyphen + 1 : -suffixlen]) + except ValueError: + pass return build_id def isremote(self, pkgname):
