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

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

diff --git a/bin/emerge b/bin/emerge
index dc70a2f8c9a946c3be46570c659f47c1bee6b25f..fa9b76f038c74cdf6bcc89d35d6c77fe92459bbb 100755 (executable)
--- 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: