summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 07:48:13 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 07:48:13 +0000
commit8d4851ca9b3db3bee0fea45c8fa7e12e156fae79 (patch)
tree931ebf75c4bce872cd91c56aec9d01e2cedf46ad /pym
parentca7d37c4885e7cdf1b423e2ad901f6894530eee3 (diff)
downloadportage-8d4851ca9b3db3bee0fea45c8fa7e12e156fae79.tar.gz
portage-8d4851ca9b3db3bee0fea45c8fa7e12e156fae79.tar.bz2
portage-8d4851ca9b3db3bee0fea45c8fa7e12e156fae79.zip
Don't default env=os.environ directly in the config constructor because
that makes it show environment variables in api docs generated by epydoc. (trunk r12824) svn path=/main/branches/2.1.6/; revision=13055
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index dc007cb24..80ab03a95 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1117,7 +1117,7 @@ class config(object):
def __init__(self, clone=None, mycpv=None, config_profile_path=None,
config_incrementals=None, config_root=None, target_root=None,
- local_config=True, env=os.environ):
+ local_config=True, env=None):
"""
@param clone: If provided, init will use deepcopy to copy by value the instance.
@type clone: Instance of config class.
@@ -1455,6 +1455,8 @@ class config(object):
expand_map.update(env_d)
# backupenv is used for calculating incremental variables.
+ if env is None:
+ env = os.environ
self.backupenv = env.copy()
if env_d: