From 895bbe44b3d6543904ad7badecac0bf18c6650ad Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 7 Jun 2006 11:53:30 +0000 Subject: Also bump the counter for the "merge" phase since it calls spawnebuild (bug #135856). svn path=/main/trunk/; revision=3465 --- pym/portage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 8dc6d4c0c..79271d36a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2860,8 +2860,9 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, "%s-%s.log" % (str(vartree.dbapi.get_counter_tick_core("/")), mysettings["PF"])) - if logfile and mydo in actionmap_deps and "PORTAGE_CALLER" in os.environ \ - and os.environ["PORTAGE_CALLER"] == "emerge": + if logfile and "PORTAGE_CALLER" in os.environ and \ + os.environ["PORTAGE_CALLER"] == "emerge" and \ + mydo in ["merge"] + actionmap_deps.keys(): # Increment the counter so that each new build attempt gets it's # own unique log file (portage uses the counter for nothing more than # log handling, though it can be used to determine merge order). -- cgit v1.2.3-1-g7c22