From b76d2cb80bce6611dbd93db1819b4a449556acba Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 Feb 2006 07:52:00 +0000
Subject: add a new emerge --ignore-default-opts option for bug 121695

svn path=/main/trunk/; revision=2696
---
 bin/emerge | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bin/emerge')

diff --git a/bin/emerge b/bin/emerge
index 099a38a9d..c423aede3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -182,7 +182,8 @@ options=[
 "--emptytree",
 "--fetchonly",    "--fetch-all-uri",
 "--getbinpkg",    "--getbinpkgonly",
-"--help",         "--noconfmem",
+"--help",         "--ignore-default-opts",
+"--noconfmem",
 "--newuse",       "--nocolor",
 "--nodeps",       "--noreplace",
 "--nospinner",    "--oneshot",
@@ -226,7 +227,8 @@ edebug=0
 
 # process short actions
 tmpcmdline=sys.argv[1:]
-tmpcmdline.extend(portage.settings["EMERGE_DEFAULT_OPTS"].split())
+if "--ignore-default-opts" not in tmpcmdline:
+	tmpcmdline.extend(portage.settings["EMERGE_DEFAULT_OPTS"].split())
 cmdline=[]
 for x in tmpcmdline:
 	if x[0:1]=="-" and x[1:2]!="-":
-- 
cgit v1.2.3-1-g7c22