mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
Remove trailing underscore from cmd_{un,}zip_
This is unnecessary and means that one needs to use the trailing underscore if they want to directly run those functions.
This commit is contained in:
parent
e46ccc8210
commit
ff221219f2
@ -169,8 +169,8 @@ def gunzip(gzipfile, template=None, runas=None):
|
||||
|
||||
|
||||
@decorators.which('zip')
|
||||
def cmd_zip_(zip_file, sources, template=None,
|
||||
cwd=None, recurse=False, runas=None):
|
||||
def cmd_zip(zip_file, sources, template=None,
|
||||
cwd=None, recurse=False, runas=None):
|
||||
'''
|
||||
Uses the zip command to create zip files
|
||||
|
||||
@ -225,8 +225,8 @@ def cmd_zip_(zip_file, sources, template=None,
|
||||
python_shell=False).splitlines()
|
||||
|
||||
|
||||
@decorators.depends('zipfile', fallback_function=cmd_zip_)
|
||||
def zip_(archive, sources, template=None, runas=None):
|
||||
@decorators.depends('zipfile', fallback_function=cmd_zip)
|
||||
def zip_(archive, sources, template=None):
|
||||
'''
|
||||
Uses the zipfile module to create zip files
|
||||
|
||||
@ -271,7 +271,8 @@ def zip_(archive, sources, template=None, runas=None):
|
||||
|
||||
|
||||
@decorators.which('unzip')
|
||||
def cmd_unzip_(zip_file, dest, excludes=None, template=None, options=None, runas=None):
|
||||
def cmd_unzip(zip_file, dest, excludes=None,
|
||||
template=None, options=None, runas=None):
|
||||
'''
|
||||
Uses the unzip command to unpack zip files
|
||||
|
||||
@ -321,8 +322,8 @@ def cmd_unzip_(zip_file, dest, excludes=None, template=None, options=None, runas
|
||||
python_shell=False).splitlines()
|
||||
|
||||
|
||||
@decorators.depends('zipfile', fallback_function=cmd_unzip_)
|
||||
def unzip(archive, dest, excludes=None, template=None, options=None, runas=None):
|
||||
@decorators.depends('zipfile', fallback_function=cmd_unzip)
|
||||
def unzip(archive, dest, excludes=None, template=None, options=None):
|
||||
'''
|
||||
Uses the zipfile module to unpack zip files
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user