From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 12 Jan 2009 08:29:23 +0000 (-0000)
Subject: Bug #241808 - When loading options for --resume, discard the --color option
X-Git-Tag: v2.1.6.5~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f0955745d08089375c578f58619f8aa41ea0ef1;p=portage.git

Bug #241808 - When loading options for --resume, discard the --color option
so it doesn't override the current setting. (trunk r12428)

svn path=/main/branches/2.1.6/; revision=12482
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bdbd3b1c1..45e9c2a35 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13415,7 +13415,7 @@ def action_build(settings, trees, mtimedb,
 		resume_opts = mtimedb["resume"].get("myopts", [])
 		if isinstance(resume_opts, list):
 			resume_opts = dict((k,True) for k in resume_opts)
-		for opt in ("--skipfirst", "--ask", "--tree"):
+		for opt in ("--ask", "--color", "--skipfirst", "--tree"):
 			resume_opts.pop(opt, None)
 		myopts.update(resume_opts)