saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #40059 from terminalmage/fix-virtualenv-traceback

Browse source 
Fix traceback when virtualenv.managed is invoked with nonexistant user
This commit is contained in:
Nicole Thomas 2017-03-16 14:46:42 -06:00 • committed by GitHub
commit 116201f345
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/states/virtualenv_mod.py
View file

@ -14,7 +14,7 @@ import os
import salt.version
import salt.utils
from salt.exceptions import CommandNotFoundError
from salt.exceptions import CommandExecutionError, CommandNotFoundError
from salt.ext import six
log = logging.getLogger(__name__)
@ -237,7 +237,12 @@ def managed(name,
# Populate the venv via a requirements file
if requirements or pip_pkgs:
before = set(__salt__['pip.freeze'](bin_env=name, user=user, use_vt=use_vt))
try:
before = set(__salt__['pip.freeze'](bin_env=name, user=user, use_vt=use_vt))
except CommandExecutionError as exc:
ret['result'] = False
ret['comment'] = exc.strerror
return ret
if requirements: