diff options
| author | Jason Stubbs <jstubbs@gentoo.org> | 2006-01-27 04:50:09 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2006-01-27 04:50:09 +0000 |
| commit | 75dec43f2c32292f4c788d8e4fa845d2cbaeaa51 (patch) | |
| tree | e43fdddcde33a7bc27e60c34cc98d9d6f027784d /bin/emerge | |
| parent | 429292b73250c9df497da780cac9c633207f3e83 (diff) | |
| download | portage-75dec43f2c32292f4c788d8e4fa845d2cbaeaa51.tar.gz portage-75dec43f2c32292f4c788d8e4fa845d2cbaeaa51.tar.bz2 portage-75dec43f2c32292f4c788d8e4fa845d2cbaeaa51.zip | |
Add support for EMERGE_DEFAULT_OPTS configuration variable for setting
options that emerge always considers to be specified.
svn path=/main/trunk/; revision=2588
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 82915725d..a41b372a9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -222,7 +222,7 @@ edebug=0 # process short actions tmpcmdline=sys.argv[1:] -#tmpcmdline.extend(portage.settings["EMERGE_OPTS"].split()) +tmpcmdline.extend(portage.settings["EMERGE_DEFAULT_OPTS"].split()) cmdline=[] for x in tmpcmdline: if x[0:1]=="-" and x[1:2]!="-": @@ -3025,7 +3025,7 @@ elif "info"==myaction: myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', 'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS', - 'ACCEPT_KEYWORDS', 'SYNC', 'FEATURES'] + 'ACCEPT_KEYWORDS', 'SYNC', 'FEATURES', 'EMERGE_DEFAULT_OPTS'] myvars.extend(portage_util.grabfile(portage.settings["PORTDIR"]+"/profiles/info_vars")) |