From: Jason Stubbs <jstubbs@gentoo.org>
Date: Sat, 17 Dec 2005 02:26:18 +0000 (-0000)
Subject: Add --verbose to the list of options that need to be removed from those
X-Git-Tag: v2.1_pre1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=688327f0627a41c24a58cf2486b5d53c95952ecc;p=portage.git

Add --verbose to the list of options that need to be removed from those
pulled from the mtimedb when using --resume. Patch by Alec Warner
(antarus). Code-style cleanups.  #74990

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

diff --git a/bin/emerge b/bin/emerge
index f0ea1bafe..b4474bb0d 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3128,10 +3128,9 @@ else:
 	if ("--resume" in myopts) and portage.mtimedb.has_key("resume"):
 		myresumeopts=portage.mtimedb["resume"]["myopts"][:]
 
-		while "--skipfirst" in myresumeopts:
-			myresumeopts.remove("--skipfirst")
-		while "--ask" in myresumeopts:
-			myresumeopts.remove("--ask")
+		for opt in ("--skipfirst", "--ask", "--verbose"):
+			while opt in myresumeopts:
+				myresumeopts.remove(opt)
 
 		for myopt in myopts:
 			if myopt not in myresumeopts: