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 f0ea1bafe32be9eb967e951a793953f6d63a4fb7..b4474bb0df4dc557a8574877df3a98fc56c2561c 100755 (executable)
--- 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: