add a new emerge --ignore-default-opts option for bug 121695

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

diff --git a/bin/emerge b/bin/emerge
index 099a38a9d9de8f98a3ebec3148be03f82eba69d1..c423aede388d8ce115dc96ff5275dedee49c1fae 100755 (executable)
--- 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]!="-":

diff --git a/man/emerge.1 b/man/emerge.1
index 4caaa4a9fa17049444698fd4270a4b88e032f466..fcb33ea5406ba7c5bc2f901c2512300a545af923 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -275,6 +275,9 @@ information from the local machine.  All binaries will be downloaded from the
 remote server without consulting packages existing in the local packages 
 directory.
 .TP
+.BR "\-\-ignore-default-opts"
+Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored.
+.TP
 .BR "\-\-newuse " (\fB\-N\fR)
 Tells emerge to include installed packages where USE flags have changed since 
 compilation.  An asterisk marks when a USE flag has changed since the package 

diff --git a/man/make.conf.5 b/man/make.conf.5
index ee1bcb22f55786dbc01f3ff286bcb0657e100c52..f881534e55fa062ff6cbbe8ca4d43826a67bff8e 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -99,7 +99,9 @@ Defines whether or not to ignore audible beeps when displaying important
 informational messages.  This variable is unset by default.
 .TP
 .B EMERGE_DEFAULT_OPTS
-Options to append to the end of the emerge command line on every invocation.
+Options to append to the end of the \fBemerge\fR(1) command line on every invocation.
+These options will not be appended to the command line if --ignore-default-opts
+is specified.
 .TP
 .B EPAUSE_IGNORE
 Defines whether or not to ignore short pauses that occur when displaying