commit: 682fc4b8ea1b2caeeef88596508026edea8e8ac5 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Nov 16 23:41:57 2017 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Nov 16 23:47:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=682fc4b8
quickpkg: report all binarytree.inject failures (bug 637902) The binarytree.inject method should not return None unless something went wrong, therefore report failure whenever it returns None. Bug: https://bugs.gentoo.org/637902 bin/quickpkg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/quickpkg b/bin/quickpkg index 7e9aa1373..ec6f50409 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -185,11 +185,12 @@ def quickpkg_atom(options, infos, arg, eout): binpkg_path = bintree.getname(pkg_info or cpv) try: s = os.stat(binpkg_path) - except OSError as e: + except OSError: + s = None + + if s is None or pkg_info is None: # Sanity check, shouldn't happen normally. eout.eend(1) - eout.eerror(str(e)) - del e eout.eerror("Failed to create package: '%s'" % binpkg_path) retval |= 1 else:
