From 0cb0e00b95a0be859241a5d0947312d84b0bc205 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 8 Jun 2006 16:15:09 +0000 Subject: [PATCH] When an ebuild from overlay fails, display a message indicating which overlay it came from (bug #136031). Thanks to genstef for the initial patch. svn path=/main/trunk/; revision=3473 --- pym/portage.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pym/portage.py b/pym/portage.py index 3742b708f..787b9d20c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3044,6 +3044,19 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, mysettings["DISTDIR"] = mysettings["PORTAGE_ACTUAL_DISTDIR"] del mysettings["PORTAGE_ACTUAL_DISTDIR"] + if retval != os.EX_OK and tree == "porttree": + for i in xrange(len(mydbapi.porttrees)-1): + t = mydbapi.porttrees[i+1] + if myebuild.startswith(t): + # Display the non-cannonical path, in case it's different, to + # prevent confusion. + overlays = mysettings["PORTDIR_OVERLAY"].split() + try: + writemsg("!!! This ebuild is from an overlay: '%s'\n" % \ + overlays[i], noiselevel=-1) + except KeyError: + pass + return retval expandcache={} -- 2.26.2