mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
archive.extracted: Use user
/group
, not archive_user
Ensure that any created parent directories are made with `user`/`group` perms, not as the `archive_user` user. This also allows setting the group for these dirs instead of defaulting to `root`. The `archive_user` argument to archive.extracted has been deprecated since version 2014.7.2, and supplanted by the `user` parameter in 2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out, complete the deprecation by: - no longer silently using `archive_user` in `archive.extracted`, preferring instead `user` and `group`, - no longer accepted `archive_user` as an argument. Also update man page.
This commit is contained in:
parent
76dca64d03
commit
4a9568d0b0
2 changed files with 2 additions and 8 deletions
|
@ -208217,7 +208217,7 @@ New in version 2014.1.0.
|
|||
.UNINDENT
|
||||
.INDENT 0.0
|
||||
.TP
|
||||
.B salt.states.archive.extracted(name, source, archive_format, archive_user=None, password=None, user=None, group=None, tar_options=None, source_hash=None, if_missing=None, keep=False, trim_output=False, source_hash_update=None)
|
||||
.B salt.states.archive.extracted(name, source, archive_format, password=None, user=None, group=None, tar_options=None, source_hash=None, if_missing=None, keep=False, trim_output=False, source_hash_update=None)
|
||||
New in version 2014.1.0.
|
||||
|
||||
.sp
|
||||
|
@ -208322,11 +208322,6 @@ New in version 2016.3.0.
|
|||
.TP
|
||||
.B archive_format
|
||||
\fBtar\fP, \fBzip\fP or \fBrar\fP
|
||||
.TP
|
||||
.B archive_user
|
||||
The user to own each extracted file.
|
||||
.sp
|
||||
Deprecated since version 2014.7.2: Replaced by \fBuser\fP parameter
|
||||
|
||||
.TP
|
||||
.B user
|
||||
|
|
|
@ -84,7 +84,6 @@ def _cleanup_destdir(name):
|
|||
def extracted(name,
|
||||
source,
|
||||
archive_format,
|
||||
archive_user=None,
|
||||
password=None,
|
||||
user=None,
|
||||
group=None,
|
||||
|
@ -371,7 +370,7 @@ def extracted(name,
|
|||
.format(name.rstrip('/')))
|
||||
return ret
|
||||
elif not __salt__['file.directory_exists'](name):
|
||||
__salt__['file.makedirs'](name, user=archive_user)
|
||||
__salt__['file.makedirs'](name, user=user, group=group)
|
||||
created_destdir = True
|
||||
|
||||
log.debug('Extracting {0} to {1}'.format(filename, name))
|
||||
|
|
Loading…
Add table
Reference in a new issue