From e9e1c284de2426b386c4d0c6ed2e6d984e5da5c8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 29 Sep 2006 20:37:26 +0000 Subject: Allow options contained in EMERGE_DEFAULT_OPTS to be overridden by the real command line options. svn path=/main/trunk/; revision=4560 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index dc70a2f8c..fa9b76f03 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: -- cgit v1.2.3-1-g7c22