mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-11 15:15:26 +01:00
Compare commits
5 commits
27ee5233a4
...
19e89f1095
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19e89f1095 | ||
|
|
d3204df536 | ||
|
|
162e72182f | ||
|
|
9ec1d668b4 | ||
|
|
392fd0deaa |
5 changed files with 11 additions and 8 deletions
|
|
@ -64,7 +64,7 @@ stages:
|
||||||
- template: templates/matrix.yml
|
- template: templates/matrix.yml
|
||||||
parameters:
|
parameters:
|
||||||
nameFormat: "{0}"
|
nameFormat: "{0}"
|
||||||
testFormat: 2.19/{0OI}
|
testFormat: 2.19/{0}
|
||||||
targets:
|
targets:
|
||||||
- name: Sanity
|
- name: Sanity
|
||||||
test: sanity
|
test: sanity
|
||||||
|
|
@ -92,7 +92,6 @@ stages:
|
||||||
dependsOn: []
|
dependsOn: []
|
||||||
jobs:
|
jobs:
|
||||||
- template: templates/matrix.yml
|
- template: templates/matrix.yml
|
||||||
I
|
|
||||||
parameters:
|
parameters:
|
||||||
nameFormat: "{0}"
|
nameFormat: "{0}"
|
||||||
testFormat: 2.17/{0}
|
testFormat: 2.17/{0}
|
||||||
|
|
|
||||||
2
changelogs/fragments/638_fix_recursive_acl.yml
Normal file
2
changelogs/fragments/638_fix_recursive_acl.yml
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- acl - correctly assert needed changes when pointing to a directory and recursive is set to true.
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
~--
|
---
|
||||||
trivial:
|
trivial:
|
||||||
- Bump ansible-core version to 2.20 of devel branch and add 2.19 to CI
|
- Bump ansible-core version to 2.20 of devel branch and add 2.19 to CI
|
||||||
|
|
|
||||||
2
changelogs/fragments/660_ci_azp_syntax.yml
Normal file
2
changelogs/fragments/660_ci_azp_syntax.yml
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
trivial:
|
||||||
|
- AZP - fixed syntax error in CI test.
|
||||||
|
|
@ -244,16 +244,16 @@ def acl_changed(module, cmd, entry, use_nfsv4_acls=False):
|
||||||
lines = run_acl(module, cmd)
|
lines = run_acl(module, cmd)
|
||||||
counter = 0
|
counter = 0
|
||||||
for line in lines:
|
for line in lines:
|
||||||
if line.endswith('*,*') and not use_nfsv4_acls:
|
if not use_nfsv4_acls and not line.endswith('*,*'):
|
||||||
return False
|
return True
|
||||||
# if use_nfsv4_acls and entry is listed
|
# if use_nfsv4_acls and entry is listed
|
||||||
if use_nfsv4_acls and entry == line:
|
if use_nfsv4_acls and entry == line:
|
||||||
counter += 1
|
counter += 1
|
||||||
|
|
||||||
# The current 'nfs4_setfacl --test' lists a new entry,
|
# The current 'nfs4_setfacl --test' lists a new entry,
|
||||||
# which will be added at the top of list, followed by the existing entries.
|
# which will be added at the top of the list, followed by the existing entries.
|
||||||
# So if the entry has already been registered, the entry should be find twice.
|
# So if the entry has already been registered, the entry should be found twice.
|
||||||
if counter == 2:
|
if not use_nfsv4_acls or counter == 2:
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue