diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-02-12 07:52:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-02-12 07:52:00 +0000 |
| commit | b76d2cb80bce6611dbd93db1819b4a449556acba (patch) | |
| tree | 49efe9d6228daae6a209f3210657a58b50321f2b /bin | |
| parent | cc21af8b923aeb27b7f3068d00dfe20b344d9cc9 (diff) | |
| download | portage-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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 6 |
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]!="-": |