diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-26 02:05:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-26 02:05:16 +0000 |
| commit | 94486ef8d1b2507244d98cab4286c8aecbabad13 (patch) | |
| tree | d51c2beb3f2a50cc4fb08847b047a25b111de652 /pym | |
| parent | 148abc1340e37ef2b5ba84ea4df103d20dd78eba (diff) | |
| download | portage-94486ef8d1b2507244d98cab4286c8aecbabad13.tar.gz portage-94486ef8d1b2507244d98cab4286c8aecbabad13.tar.bz2 portage-94486ef8d1b2507244d98cab4286c8aecbabad13.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.
svn path=/main/trunk/; revision=8670
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index b739a4cfc..36bd65ee3 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -860,7 +860,19 @@ class config(object): # 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, |