Clear PYTHONHOME if set
Also changes necessary to clear a variable.
Change-Id: I10f4a9285f8a7fd2e88fcda82146140b34207402
diff --git a/env_setup/env_setup.py b/env_setup/env_setup.py
index bf1c918..f5c1592 100755
--- a/env_setup/env_setup.py
+++ b/env_setup/env_setup.py
@@ -72,6 +72,9 @@
def set(self, name, value):
self._actions.append(_Action('set', name, value))
+ def clear(self, name):
+ self._actions.append(_Action('set', name, None))
+
def append(self, name, value):
self._actions.append(_Action('append', name, value))
@@ -80,16 +83,17 @@
def _action_str(self, action):
if action.type == 'set':
- fmt = '{name}="{value}"'
+ if action.value is None:
+ fmt = 'unset {name}\n'
+ else:
+ fmt = '{name}="{value}"\nexport {name}\n'
elif action.type == 'append':
- fmt = '{name}="${name}{sep}{value}"'
+ fmt = '{name}="${name}{sep}{value}"\nexport {name}\n'
elif action.type == 'prepend':
- fmt = '{name}="{value}{sep}${name}"'
+ fmt = '{name}="{value}{sep}${name}"\nexport {name}\n'
else:
raise UnexpectedAction(action.name)
- fmt += '\nexport {name}\n'
-
return fmt.format(
name=action.name,
value=action.value,
@@ -99,6 +103,13 @@
def write(self, outs):
for action in self._actions:
outs.write(self._action_str(action))
+ outs.write('# This should detect bash and zsh, which have a hash \n'
+ '# command that must be called to get it to forget past \n'
+ '# commands. Without forgetting past commands the $PATH \n'
+ '# changes we made may not be respected.\n')
+ outs.write('if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then\n')
+ outs.write(' hash -r\n')
+ outs.write('fi\n')
@contextlib.contextmanager
def __call__(self):
@@ -108,7 +119,11 @@
try:
for action in self._actions:
if action.type == 'set':
- os.environ[action.name] = action.value
+ if action.value is None:
+ if action.name in os.environ:
+ del os.environ[action.name]
+ else:
+ os.environ[action.name] = action.value
elif action.type == 'append':
os.environ[action.name] = self._pathsep.join(
os.environ.get(action.name, ''), action.value)
diff --git a/env_setup/virtualenv/init.py b/env_setup/virtualenv/init.py
index 2efe17b..ddb02fa 100644
--- a/env_setup/virtualenv/init.py
+++ b/env_setup/virtualenv/init.py
@@ -144,6 +144,7 @@
if env:
env.set('VIRTUAL_ENV', venv_path)
env.prepend('PATH', os.path.join(venv_path, 'bin'))
+ env.clear('PYTHONHOME')
def _main():
