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

Make sure we don't use binary on EmptyType with lief #4900

Merged
merged 4 commits into from
Jun 6, 2023

Conversation

katietz
Copy link
Contributor

@katietz katietz commented May 25, 2023

Description

Make sure we don't run lief code for stuff in lief it doesn't has a binary for.

Fixes #4787

Checklist - did you ...

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

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label May 25, 2023
@katietz
Copy link
Contributor Author

katietz commented May 25, 2023

those failures seen seem to be unrelated to this PR

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.

@katietz Hey Kai, thanks for the patch. h-vetinari do you think this would work as well?

conda_build/os_utils/liefldd.py Outdated Show resolved Hide resolved
Co-authored-by: Jannis Leidel <jannis@leidel.info>
@beeankha
Copy link
Member

We also need a news file for this PR

@h-vetinari
Copy link
Contributor

@h-vetinari do you think this would work as well?

Fine by me!

We also need a news file for this PR

There's a suggestion in #4808 for that that you could cherry-pick here.

@katietz
Copy link
Contributor Author

katietz commented May 26, 2023

added an news entry for 4787

@jezdez jezdez changed the title make sure we don't use binary on EmptyType Make sure we don't use binary on EmptyType with lief Jun 5, 2023
@jezdez jezdez enabled auto-merge (squash) June 5, 2023 12:01
@jezdez jezdez merged commit ef12b93 into conda:main Jun 6, 2023
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Jun 6, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Unexpected binary is None in liefldd.py
5 participants