Skip to content

Commit

Permalink
use a more portable no backup argument to patch
Browse files Browse the repository at this point in the history
Use the --posix argument to prevent patch from making backup files
rather than the --no-backup-if-mismatch argument which is specific to
GNU patch and not supported by various *BSD implementations.
  • Loading branch information
jjhelmus authored and jezdez committed Jun 5, 2023
1 parent 506f0a2 commit 58d5c4e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion conda_build/source.py
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ def try_apply_patch(patch, patch_args, cwd, stdout, stderr):
temp_name = os.path.join(
tempfile.gettempdir(), next(tempfile._get_candidate_names())
)
base_patch_args = ["--no-backup-if-mismatch", "--batch"] + patch_args
base_patch_args = ["--posix", "--batch"] + patch_args
try:
try_patch_args = base_patch_args[:]
try_patch_args.append("--dry-run")
Expand Down

0 comments on commit 58d5c4e

Please sign in to comment.