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

feat: support apt colon arch syntax #38

Merged

Conversation

NotBobTheBuilder
Copy link
Contributor

debian package files seem to make use of this shorthand in packages that depend on python:

Architecture: all
Depends: python3:any

This PR adds support for parsing this correctly, fixing the error whereby python3:any would be assumed to be the name of the whole package

debian package files seem to make use of this shorthand in packages that depend on python:

Architecture: all
Depends: python3:any

This PR adds support for parsing this correctly, fixing the error whereby python3:any would be assumed to be the name of the whole package
@NotBobTheBuilder
Copy link
Contributor Author

sorry for the diff in bullseye.lock. I think my ide reformatted it. I'll fix that up.

@NotBobTheBuilder
Copy link
Contributor Author

Actually I'm not sure what caused that, it seems to be a whitespace-only change that is reproducible when I run bazel run @bullseye//:lock. I'm guessing it is environmental, if you have any tips as to what it could be, let me know.

# Depends: python3:any
# is equivalent to
# Depends: python3 [any]
colon_i = raw.find(":")
Copy link
Collaborator

Choose a reason for hiding this comment

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

@NotBobTheBuilder
Copy link
Contributor Author

Thanks for the pointer to that directory -- I added a simple case for python3:any and another couple of cases from the bullseye Packages file. A few package in the gcc cross-compile toolchain also seems to use this pattern.

@thesayyn
Copy link
Collaborator

thesayyn commented May 1, 2024

Could you solve the conflicts?

@NotBobTheBuilder
Copy link
Contributor Author

Happily! Conflicts resolved

@thesayyn
Copy link
Collaborator

thesayyn commented May 1, 2024

PR is bumping into #36, can you remove the new package?

@thesayyn
Copy link
Collaborator

thesayyn commented May 1, 2024

i believe you need to regenerate the lockfile again.

@NotBobTheBuilder
Copy link
Contributor Author

Hmm interesting, I ran that after the merge conflict and it generated a smaller file but with some additional dependencies, and when I just ran it again, there was no change. Is it possible this fix has unmasked dependencies that were missing?

They seem to be gcc related, which I have seen use the :arch pattern

@thesayyn
Copy link
Collaborator

thesayyn commented May 1, 2024

yeah that's probably it. thank you!

@thesayyn thesayyn merged commit 1cea502 into GoogleContainerTools:main May 1, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants