cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: action _fixup_perms2 macos +a remote_paths in list() as it can be a tuple (#74613)

Browse source 
* fix: action _fixup_perms2 macos +a remote_paths in list() as it can be tuple

in `lib/ansible/plugin/action/__init__.py`'s `_fixup_perms2`,
`remote_paths` can be a list or tuple. however, the macos
specific attempt to use chmod +a attempts to concatenate
`remote_paths` with a list, which will fail if it is a tuple.
wrapping `remote_paths` in `list()` fixes this error.

* Update changelogs/fragments/74613-actionfixup_perms2_macos_remote_paths_ensure_list.yml

Co-authored-by: Rick Elrod <rick@elrod.me>
This commit is contained in:
Shane St Savage 2021-05-11 08:08:33 -07:00 committed by GitHub
parent 8fb54885bf
commit df6554c4ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/74613-actionfixup_perms2_macos_remote_paths_ensure_list.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "remote tmpdir permissions - fix type error in macOS chmod ACL fallback (https://github.com/ansible/ansible/pull/74613)."

2
lib/ansible/plugins/action/__init__.py
View file

@ -630,7 +630,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
# pass that argument as the first element of remote_paths. So we end # pass that argument as the first element of remote_paths. So we end
# up running `chmod +a [that argument] [file 1] [file 2] ...` # up running `chmod +a [that argument] [file 1] [file 2] ...`
try: try:
res = self._remote_chmod([chmod_acl_mode] + remote_paths, '+a') res = self._remote_chmod([chmod_acl_mode] + list(remote_paths), '+a')
except AnsibleAuthenticationFailure as e: except AnsibleAuthenticationFailure as e:
# Solaris-based chmod will return 5 when it sees an invalid mode, # Solaris-based chmod will return 5 when it sees an invalid mode,
# and +a is invalid there. Because it returns 5, which is the same # and +a is invalid there. Because it returns 5, which is the same