Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check return code when selecting patch type #4873

Closed
wants to merge 2 commits into from

Conversation

jjhelmus
Copy link
Contributor

@jjhelmus jjhelmus commented May 5, 2023

Description

When selecting between the .native, .lf, and .crlf patches, do not mark the result as successful if a non-zero (failure) return value was returned.

This also allows platforms whose patch commands do not support the --binary argument, such as FreeBSD, to use patches in recipes.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label May 5, 2023
Copy link
Member

@jezdez jezdez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the patch @jjhelmus, could you add a news item?

@jjhelmus
Copy link
Contributor Author

jjhelmus commented May 8, 2023

Thanks for the patch @jjhelmus, could you add a news item?

Done

@jezdez jezdez added this to the 3.25.0 milestone May 9, 2023
@kenodegard
Copy link
Contributor

@jjhelmus the tests are all hanging around the same place (I’ve also rerun the tests twice and get the same issue) so something is wrong with this change

@beeankha beeankha removed this from the 3.25.0 milestone May 22, 2023
When determining which patch file to apply check the return code of the
patch command and ignore those which indicate failure.
Copy link

github-actions bot commented Jun 5, 2024

Hi there, thank you for your contribution!

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed automatically if no further activity occurs.

If you would like this pull request to remain open please:

  1. Rebase and verify the changes still work
  2. Leave a comment with the current status

NOTE: If this pull request was closed prematurely, please leave a comment.

Thanks!

1 similar comment
Copy link

github-actions bot commented Jun 5, 2024

Hi there, thank you for your contribution!

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed automatically if no further activity occurs.

If you would like this pull request to remain open please:

  1. Rebase and verify the changes still work
  2. Leave a comment with the current status

NOTE: If this pull request was closed prematurely, please leave a comment.

Thanks!

@github-actions github-actions bot added the stale [bot] marked as stale due to inactivity label Jun 5, 2024
@github-actions github-actions bot added the stale::closed [bot] closed after being marked as stale label Jul 6, 2024
@github-actions github-actions bot closed this Jul 6, 2024
@github-actions github-actions bot added stale::recovered [bot] recovered after being marked as stale and removed stale::closed [bot] closed after being marked as stale stale [bot] marked as stale due to inactivity labels Jul 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA stale::recovered [bot] recovered after being marked as stale
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

5 participants