Allow options contained in EMERGE_DEFAULT_OPTS to be overridden by the real command line options.

svn path=/main/trunk/; revision=4560

1 files changed, 2 insertions, 1 deletions

diff --git a/bin/emerge b/bin/emerge
index dc70a2f8..fa9b76f0 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3848,9 +3848,10 @@ def emerge_main():
 		# instead of exporting NOCOLOR.
 		nocolor()
 
-	tmpcmdline = sys.argv[1:]
+	tmpcmdline = []
 	if "--ignore-default-opts" not in tmpcmdline:
 		tmpcmdline.extend(settings["EMERGE_DEFAULT_OPTS"].split())
+	tmpcmdline.extend(sys.argv[1:])
 	myaction, myopts, myfiles = parse_opts(tmpcmdline)
 
 	for myroot in trees: