File 0021-acl.delfacl-fix-position-of-X-option-to-se... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File 0021-acl.delfacl-fix-position-of-X-option-to-setfacl.patch of Package salt (Revision a206a62311f655d0acc61f02edd96613)

Currently displaying revision a206a62311f655d0acc61f02edd96613 , Show latest

From 565a232720c9daf1168be9f33712de79c94638ec Mon Sep 17 00:00:00 2001
From: Joerg Reuter <jreuter@yaina.de>
Date: Wed, 12 Oct 2016 13:02:38 +0200
Subject: [PATCH 21/38] - 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 4522c3f..b66f727 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.2

Places

File 0021-acl.delfacl-fix-position-of-X-option-to-setfacl.patch of Package salt (Revision a206a62311f655d0acc61f02edd96613)

Places