summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-02-12 07:52:00 +0000
committerZac Medico <zmedico@gentoo.org>2006-02-12 07:52:00 +0000
commitb76d2cb80bce6611dbd93db1819b4a449556acba (patch)
tree49efe9d6228daae6a209f3210657a58b50321f2b
parentcc21af8b923aeb27b7f3068d00dfe20b344d9cc9 (diff)
downloadportage-b76d2cb80bce6611dbd93db1819b4a449556acba.tar.gz
portage-b76d2cb80bce6611dbd93db1819b4a449556acba.tar.bz2
portage-b76d2cb80bce6611dbd93db1819b4a449556acba.zip
add a new emerge --ignore-default-opts option for bug 121695
svn path=/main/trunk/; revision=2696
-rwxr-xr-xbin/emerge6
-rw-r--r--man/emerge.13
-rw-r--r--man/make.conf.54
3 files changed, 10 insertions, 3 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]!="-":
diff --git a/man/emerge.1 b/man/emerge.1
index 4caaa4a9f..fcb33ea54 100644
--- 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 ee1bcb22f..f881534e5 100644
--- 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