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

Merge branch 'develop' into panos/develop

Browse Source
This commit is contained in:
spenceation 2017-08-10 10:25:25 -04:00 committed by GitHub
commit 0880121cf4
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/conf.py
View File

@ -258,8 +258,8 @@ if on_saltstack:
copyright = time.strftime("%Y") copyright = time.strftime("%Y")
# < --- START do not merge these settings to other branches START ---> # # < --- START do not merge these settings to other branches START ---> #
build_type = 'latest' # latest, previous, develop, next build_type = 'develop' # latest, previous, develop, next
release = latest_release # version, latest_release, previous_release release = version # version, latest_release, previous_release
# < --- END do not merge these settings to other branches END ---> # # < --- END do not merge these settings to other branches END ---> #
# Set google custom search engine # Set google custom search engine

4
salt/client/ssh/wrapper/grains.py
View File

@ -24,7 +24,9 @@ __grains__ = {}
def _serial_sanitizer(instr): def _serial_sanitizer(instr):
u'''Replaces the last 1/4 of a string with X's''' '''
Replaces the last 1/4 of a string with X's
'''
length = len(instr) length = len(instr)
index = int(math.floor(length * .75)) index = int(math.floor(length * .75))
return u'{0}{1}'.format(instr[:index], u'X' * (length - index)) return u'{0}{1}'.format(instr[:index], u'X' * (length - index))

3
salt/minion.py
View File

@ -86,7 +86,6 @@ import salt.payload
import salt.pillar import salt.pillar
import salt.syspaths import salt.syspaths
import salt.utils import salt.utils
import salt.pillar
import salt.utils.args import salt.utils.args
import salt.utils.context import salt.utils.context
import salt.utils.error import salt.utils.error
@ -319,7 +318,7 @@ def load_args_and_kwargs(func, args, data=None, ignore_invalid=False):
# list of positional arguments. This keyword argument is # list of positional arguments. This keyword argument is
# invalid. # invalid.
for key, val in six.iteritems(string_kwarg): for key, val in six.iteritems(string_kwarg):
invalid_kwargs.append(r'{0}={1}'.format(key, val)) invalid_kwargs.append(u'{0}={1}'.format(key, val))
else: else:
_args.append(arg) _args.append(arg)

5
salt/states/file.py
View File

@ -1454,7 +1454,10 @@ def absent(name):
ret['comment'] = 'Directory {0} is set for removal'.format(name) ret['comment'] = 'Directory {0} is set for removal'.format(name)
return ret return ret
try: try:
__salt__['file.remove'](name) if salt.utils.is_windows():
__salt__['file.remove'](name, force=True)
else:
__salt__['file.remove'](name)
ret['comment'] = 'Removed directory {0}'.format(name) ret['comment'] = 'Removed directory {0}'.format(name)
ret['changes']['removed'] = name ret['changes']['removed'] = name
return ret return ret

2
salt/utils/versions.py
View File

@ -11,7 +11,7 @@
because on python 3 you can no longer compare strings against integers. because on python 3 you can no longer compare strings against integers.
''' '''
# Import pytohn libs # Import python libs
from __future__ import absolute_import from __future__ import absolute_import
# pylint: disable=blacklisted-module # pylint: disable=blacklisted-module
from distutils.version import StrictVersion as _StrictVersion from distutils.version import StrictVersion as _StrictVersion