patch module: 'backup_copy' parameter renamed to 'backup'
This commit is contained in:
parent
35dd0025aa
commit
ffdb8d9eb4
1 changed files with 5 additions and 4 deletions
|
@ -65,7 +65,7 @@ options:
|
||||||
required: false
|
required: false
|
||||||
type: "int"
|
type: "int"
|
||||||
default: "0"
|
default: "0"
|
||||||
backup_copy:
|
backup:
|
||||||
description:
|
description:
|
||||||
- passes --backup --version-control=numbered to patch,
|
- passes --backup --version-control=numbered to patch,
|
||||||
producing numbered backup copies
|
producing numbered backup copies
|
||||||
|
@ -133,8 +133,9 @@ def main():
|
||||||
'basedir': {},
|
'basedir': {},
|
||||||
'strip': {'default': 0, 'type': 'int'},
|
'strip': {'default': 0, 'type': 'int'},
|
||||||
'remote_src': {'default': False, 'type': 'bool'},
|
'remote_src': {'default': False, 'type': 'bool'},
|
||||||
# don't call it "backup" since the semantics differs from the default one
|
# NB: for 'backup' parameter, semantics is slightly different from standard
|
||||||
'backup_copy': { 'default': False, 'type': 'bool' }
|
# since patch will create numbered copies, not strftime("%Y-%m-%d@%H:%M:%S~")
|
||||||
|
'backup': { 'default': False, 'type': 'bool' }
|
||||||
},
|
},
|
||||||
required_one_of=[['dest', 'basedir']],
|
required_one_of=[['dest', 'basedir']],
|
||||||
supports_check_mode=True
|
supports_check_mode=True
|
||||||
|
@ -168,7 +169,7 @@ def main():
|
||||||
if not is_already_applied(patch_func, p.src, p.basedir, dest_file=p.dest, strip=p.strip):
|
if not is_already_applied(patch_func, p.src, p.basedir, dest_file=p.dest, strip=p.strip):
|
||||||
try:
|
try:
|
||||||
apply_patch( patch_func, p.src, p.basedir, dest_file=p.dest, strip=p.strip,
|
apply_patch( patch_func, p.src, p.basedir, dest_file=p.dest, strip=p.strip,
|
||||||
dry_run=module.check_mode, backup=p.backup_copy )
|
dry_run=module.check_mode, backup=p.backup )
|
||||||
changed = True
|
changed = True
|
||||||
except PatchError, e:
|
except PatchError, e:
|
||||||
module.fail_json(msg=str(e))
|
module.fail_json(msg=str(e))
|
||||||
|
|
Loading…
Reference in a new issue