44f6a131de
- Update to 2016.3.4 see https://docs.saltstack.com/en/latest/topics/releases/2016.3.4.html - Removed Patches, applied upstream * 0008-checksum-validation-when-zypper-pkg.download.patch * 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch * 0010-snapper-execution-module.patch * 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0012-Run-salt-api-as-user-salt-bsc-990029.patch * 0013-Deprecate-status.uptime-one-version-later.patch * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch * 0018-Unit-tests-fixes-for-2016.3.2.patch * 0019-Fix-snapper_test-for-python26.patch * 0020-Integration-tests-fixes-for-2016.3.2.patch * 0021-Fix-pkg.upgrade-for-zypper.patch * 0022-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch * 0023-acl.delfacl-fix-position-of-X-option-to-setfacl.patch * 0024-Change-travis-configuration-file-to-use-salt-toaster.patch * 0025-Adding-dist-upgrade-support-to-zypper-module.patch * 0026-Fix-pkg.latest_version-when-latest-already-installed.patch * 0027-Including-resolver-params-for-Zypper-debug-solver.patch - Added patches * 0008-snapper-execution-module.patch * 0009-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0010-Run-salt-api-as-user-salt-bsc-990029.patch * 0011-Fix-snapper_test-for-python26.patch * 0012-Fix-pkg.upgrade-for-zypper.patch * 0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch OBS-URL: https://build.opensuse.org/request/show/438684 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=81
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 3da08fe5187b0a7279b0fe6d24f969bfe1026e7a Mon Sep 17 00:00:00 2001
|
|
From: Joerg Reuter <jreuter@yaina.de>
|
|
Date: Wed, 12 Oct 2016 13:02:38 +0200
|
|
Subject: [PATCH 14/17] - acl.delfacl: fix position of -X option to setfacl
|
|
|
|
Adjust linux_acl unit test argument ordering
|
|
---
|
|
salt/modules/linux_acl.py | 4 +++-
|
|
tests/unit/modules/linux_acl_test.py | 2 +-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/modules/linux_acl.py b/salt/modules/linux_acl.py
|
|
index c23bc8c..0f5c874 100644
|
|
--- a/salt/modules/linux_acl.py
|
|
+++ b/salt/modules/linux_acl.py
|
|
@@ -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:
|
|
diff --git a/tests/unit/modules/linux_acl_test.py b/tests/unit/modules/linux_acl_test.py
|
|
index 1398636..36d3202 100644
|
|
--- a/tests/unit/modules/linux_acl_test.py
|
|
+++ b/tests/unit/modules/linux_acl_test.py
|
|
@@ -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)
|
|
--
|
|
2.10.1
|
|
|