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 branch '2019.2.1' into yaml_flow_style

Browse source
This commit is contained in:
Megan Wilhite 2019-05-13 09:52:26 -04:00 • committed by GitHub
commit e31718639e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
noxfile.py
View file

@ -35,7 +35,7 @@ SITECUSTOMIZE_DIR = os.path.join(REPO_ROOT, 'tests', 'support', 'coverage')
IS_WINDOWS = sys.platform.lower().startswith('win')
# Python versions to run against
_PYTHON_VERSIONS = ('2', '2.7', '3', '3.4', '3.5', '3.6')
_PYTHON_VERSIONS = ('2', '2.7', '3', '3.4', '3.5', '3.6', '3.7')
# Nox options
# Reuse existing virtualenvs
@ -84,8 +84,8 @@ def _get_session_python_site_packages_dir(session):
def _get_pydir(session):
version_info = _get_session_python_version_info(session)
if version_info < (2, 7) or version_info >= (3, 7):
session.error('Only Python >= 2.7 and < 3.7 is supported')
if version_info < (2, 7):
session.error('Only Python >= 2.7 is supported')
return 'py{}.{}'.format(*version_info)

5
salt/modules/acme.py
View file

@ -230,12 +230,15 @@ def cert(name,
if 'no action taken' in res['stdout']:
comment = 'Certificate {0} unchanged'.format(cert_file)
result = None
elif renew:
comment = 'Certificate {0} renewed'.format(name)
result = True
else:
comment = 'Certificate {0} obtained'.format(name)
result = True
ret = {'comment': comment, 'not_after': expires(name), 'changes': {}, 'result': True}
ret = {'comment': comment, 'not_after': expires(name), 'changes': {}, 'result': result}
ret, _ = __salt__['file.check_perms'](_cert_file(name, 'privkey'),
ret,
owner, group, mode,