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

Run patch command with --check option instead of --dry-run to support older BSDs (#42168)

Browse source
This commit is contained in:
Florian Pracht 2018-11-30 03:53:53 +01:00 committed by Brian Coca
parent bc481c2500
commit eb410a9987
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/files/patch.py
View file

@ -100,7 +100,7 @@ EXAMPLES = r'''
import os import os
from traceback import format_exc from traceback import format_exc
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule, get_platform
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
@ -108,10 +108,19 @@ class PatchError(Exception):
pass pass
def add_dry_run_option(opts):
# Older versions of FreeBSD, OpenBSD and NetBSD support the --check option only.
if get_platform().lower() in ['openbsd', 'netbsd', 'freebsd']:
opts.append('--check')
else:
opts.append('--dry-run')
def is_already_applied(patch_func, patch_file, basedir, dest_file=None, binary=False, strip=0, state='present'): def is_already_applied(patch_func, patch_file, basedir, dest_file=None, binary=False, strip=0, state='present'):
opts = ['--quiet', '--forward', '--dry-run', opts = ['--quiet', '--forward',
"--strip=%s" % strip, "--directory='%s'" % basedir, "--strip=%s" % strip, "--directory='%s'" % basedir,
"--input='%s'" % patch_file] "--input='%s'" % patch_file]
add_dry_run_option(opts)
if binary: if binary:
opts.append('--binary') opts.append('--binary')
if dest_file: if dest_file:
@ -128,7 +137,7 @@ def apply_patch(patch_func, patch_file, basedir, dest_file=None, binary=False, s
"--strip=%s" % strip, "--directory='%s'" % basedir, "--strip=%s" % strip, "--directory='%s'" % basedir,
"--input='%s'" % patch_file] "--input='%s'" % patch_file]
if dry_run: if dry_run:
opts.append('--dry-run') add_dry_run_option(opts)
if binary: if binary:
opts.append('--binary') opts.append('--binary')
if dest_file: if dest_file: