summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-09-29 20:37:26 +0000
committerZac Medico <zmedico@gentoo.org>2006-09-29 20:37:26 +0000
commite9e1c284de2426b386c4d0c6ed2e6d984e5da5c8 (patch)
tree92b85ab5dce34b16014477a430c459087ddb86c5
parent69afaa9e8d2cbe2f910301731eb7d557e833ad24 (diff)
downloadportage-e9e1c284de2426b386c4d0c6ed2e6d984e5da5c8.tar.gz
portage-e9e1c284de2426b386c4d0c6ed2e6d984e5da5c8.tar.bz2
portage-e9e1c284de2426b386c4d0c6ed2e6d984e5da5c8.zip
Allow options contained in EMERGE_DEFAULT_OPTS to be overridden by the real command line options.
svn path=/main/trunk/; revision=4560
-rwxr-xr-xbin/emerge3
1 files changed, 2 insertions, 1 deletions
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: