diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-26 02:11:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-26 02:11:56 +0000 |
| commit | fc91f61c537075254d547460d81fe1671df2c49f (patch) | |
| tree | 18386522abff83c4c4514df848b109a1b30452f7 /pym | |
| parent | efec767fb9c4ba15ae76fb9872c9f254be91d562 (diff) | |
| download | portage-fc91f61c537075254d547460d81fe1671df2c49f.tar.gz portage-fc91f61c537075254d547460d81fe1671df2c49f.tar.bz2 portage-fc91f61c537075254d547460d81fe1671df2c49f.zip | |
* Move filtering of a bunch of portage config variables from
save_ebuild_env() to config.environ().
* Add EMERGE_FROM to the READONLY_PORTAGE_VARS list.
(trunk r8670)
svn path=/main/branches/2.1.2/; revision=8671
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index bbaee8027..40f38a200 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -964,7 +964,19 @@ class config: # Filter selected variables in the config.environ() method so that # they don't needlessly propagate down into the ebuild environment. - _environ_filter = frozenset(["PORTAGE_ECLASS_WARNING_ENABLE"]) + _environ_filter = frozenset(["ACCEPT_KEYWORDS", "AUTOCLEAN", + "CLEAN_DELAY", "COLLISION_IGNORE", "CONFIG_PROTECT", + "CONFIG_PROTECT_MASK", "EMERGE_DEFAULT_OPTS", + "EMERGE_WARNING_DELAY", "FETCHCOMMAND", "FETCHCOMMAND_FTP", + "FETCHCOMMAND_HTTP", "FETCHCOMMAND_SFTP", "GENTOO_MIRRORS", "O", + "PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_CALLER", + "PORTAGE_ECLASS_WARNING_ENABLE", "PORTAGE_ELOG_CLASSES", + "PORTAGE_ELOG_MAILFROM", "PORTAGE_ELOG_MAILSUBJECT", + "PORTAGE_ELOG_MAILURI", "PORTAGE_ELOG_SYSTEM", "PORTAGE_GPG_DIR", + "PORTAGE_GPG_KEY", "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS", + "PORTAGE_RSYNC_RETRIES", "PORT_LOGDIR", "QUICKPKG_DEFAULT_OPTS", + "RESUMECOMMAND", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTP", + "RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER"]) def __init__(self, clone=None, mycpv=None, config_profile_path=None, config_incrementals=None, config_root=None, target_root=None, |