From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 Mar 2006 04:11:33 +0000 (-0000)
Subject: Add --tree to the blacklist when --resume is used.  See bug #54040.
X-Git-Tag: v2.1_pre7~115
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72508da76222527fb442c3099cf04e3c9a4587b2;p=portage.git

Add --tree to the blacklist when --resume is used.  See bug #54040.

svn path=/main/trunk/; revision=2857
---

diff --git a/bin/emerge b/bin/emerge
index 83ee205ad..eb9db58ab 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3156,7 +3156,7 @@ else:
 			portage.commit_mtimedb()
 		myresumeopts=portage.mtimedb["resume"]["myopts"][:]
 
-		for opt in ("--skipfirst", "--ask", "--verbose"):
+		for opt in ("--skipfirst", "--ask", "--verbose", "--tree"):
 			while opt in myresumeopts:
 				myresumeopts.remove(opt)