summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-08 16:15:09 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-08 16:15:09 +0000
commit0cb0e00b95a0be859241a5d0947312d84b0bc205 (patch)
tree20aa0479c6134b8bf405ac2a5de762933653ca97
parent5ae6dc6df80793bf6770d6098e813da9524714d3 (diff)
downloadportage-0cb0e00b95a0be859241a5d0947312d84b0bc205.tar.gz
portage-0cb0e00b95a0be859241a5d0947312d84b0bc205.tar.bz2
portage-0cb0e00b95a0be859241a5d0947312d84b0bc205.zip
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
-rw-r--r--pym/portage.py13
1 files changed, 13 insertions, 0 deletions
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={}