mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Merge pull request #14698 from hemebond/2014.7
Quote paths passed to patch. Fixes #14536.
This commit is contained in:
commit
d6abc8c71e
@ -1451,7 +1451,7 @@ def patch(originalfile, patchfile, options='', dry_run=False):
|
||||
dry_run_opt = ' --dry-run'
|
||||
else:
|
||||
dry_run_opt = ''
|
||||
cmd = 'patch {0}{1} {2} {3}'.format(
|
||||
cmd = 'patch {0}{1} "{2}" "{3}"'.format(
|
||||
options, dry_run_opt, originalfile, patchfile)
|
||||
return __salt__['cmd.run_all'](cmd)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user