diff --git a/conda/activate.py b/conda/activate.py index fa9a7d50e85..112b6cb921e 100644 --- a/conda/activate.py +++ b/conda/activate.py @@ -613,6 +613,9 @@ def __init__(self, arguments=None): def _update_prompt(self, set_vars, conda_prompt_modifier): ps1 = self.environ.get('PS1', '') + if 'POWERLINE_COMMAND' in ps1: + # Defer to powerline (https://github.com/powerline/powerline) if it's in use. + return current_prompt_modifier = self.environ.get('CONDA_PROMPT_MODIFIER') if current_prompt_modifier: ps1 = re.sub(re.escape(current_prompt_modifier), r'', ps1)