valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40097 from rallytime/merge-2016.11

Browse Source 
[2016.11] Merge forward from 2016.3 to 2016.11
This commit is contained in:
Nicole Thomas 2017-03-17 09:17:08 -06:00 committed by GitHub
commit baef5009aa
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mention-bot
View File

@ -1,5 +1,5 @@
{
"skipTitle": "Merge forward",
"userBlacklist": []
"userBlacklist": ["cvrebert", "markusgattol", "olliewalsh"]
}

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: