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 #37866 from meaksh/2016.3-bp-37149-36938-36784

Browse source 
Backport #37149 #36938 and #36784 to 2016.3
This commit is contained in:
Nicole Thomas 2016-11-23 14:54:17 -07:00 • committed by GitHub
commit 56baa92d55
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/core.py
View file

@ -1038,6 +1038,7 @@ _OS_NAME_MAP = {
'manjaro': 'Manjaro',
'antergos': 'Antergos',
'sles': 'SUSE',
'slesexpand': 'RES',
'linuxmint': 'Mint',
}
@ -1057,6 +1058,7 @@ _OS_FAMILY_MAP = {
'OEL': 'RedHat',
'XCP': 'RedHat',
'XenServer': 'RedHat',
'RES': 'RedHat',
'Mandrake': 'Mandriva',
'ESXi': 'VMWare',
'Mint': 'Debian',

4
salt/modules/linux_acl.py
View file

@ -250,10 +250,12 @@ def delfacl(acl_type, acl_name='', *args, **kwargs):
_raise_on_no_files(*args)
cmd = 'setfacl -x'
cmd = 'setfacl'
if recursive:
cmd += ' -R'
cmd += ' -x'
cmd = '{0} {1}:{2}'.format(cmd, _acl_prefix(acl_type), acl_name)
for dentry in args:

2
salt/states/pkg.py
View file

@ -1679,7 +1679,7 @@ def latest(
targets = {}
problems = []
for pkg in desired_pkgs:
if not avail[pkg]:
if not avail.get(pkg):
# Package either a) is up-to-date, or b) does not exist
if not cur[pkg]:
# Package does not exist

2
tests/unit/modules/linux_acl_test.py
View file

@ -193,4 +193,4 @@ class LinuxAclTestCase(TestCase):
def test_delfacl__recursive_w_multiple_args(self):
linux_acl.delfacl(*(self.default_user_acl[:-1] + self.files), recursive=True)
self.cmdrun.assert_called_once_with('setfacl -x -R ' + ' '.join([self.default_user_acl_cmd.rpartition(':')[0]] + self.files), python_shell=False)
self.cmdrun.assert_called_once_with('setfacl -R -x ' + ' '.join([self.default_user_acl_cmd.rpartition(':')[0]] + self.files), python_shell=False)