summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge6
1 files changed, 4 insertions, 2 deletions
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]!="-":