summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-07 11:53:30 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-07 11:53:30 +0000
commit895bbe44b3d6543904ad7badecac0bf18c6650ad (patch)
treea44acb724111796d286aa21b98da3c4805822bf1
parent995bc1ad3e197201b7e35db5a30e81540c35390c (diff)
downloadportage-895bbe44b3d6543904ad7badecac0bf18c6650ad.tar.gz
portage-895bbe44b3d6543904ad7badecac0bf18c6650ad.tar.bz2
portage-895bbe44b3d6543904ad7badecac0bf18c6650ad.zip
Also bump the counter for the "merge" phase since it calls spawnebuild (bug #135856).
svn path=/main/trunk/; revision=3465
-rw-r--r--pym/portage.py5
1 files 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).