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.

Sign up for GitHub

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

Jump to bottom

fix: disregard scheme when looking for existing sources #140

Merged
merged 2 commits into from
Dec 5, 2024
Merged

fix: disregard scheme when looking for existing sources #140

merged 2 commits into from
Dec 5, 2024

Conversation

tigarmo
Copy link
Collaborator

@tigarmo tigarmo commented Dec 4, 2024

Apt does not take the scheme (e.g. http vs https) into account when parsing sources, which means that, for the purposes of finding existing keys, 'https://archive.ubuntu.com' and 'http://archive.ubuntu.com' should be considered the same.

Fixes #139

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run tox?

@tigarmo
fix: disregard scheme when looking for existing sources
956682e 
Apt does not take the scheme (e.g. http vs https) into account when parsing
sources, which means that, for the purposes of finding existing keys,
'https://archive.ubuntu.com' and 'http://archive.ubuntu.com' should be
considered the same.

Fixes #139
@tigarmo tigarmo requested review from lengau, mr-cal and bepri December 4, 2024 15:48
bepri
bepri requested changes Dec 4, 2024
View reviewed changes
Copy link

@bepri bepri left a comment

Choose a reason for hiding this comment

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

Looks good! Just two small notes.

craft_archives/repo/apt_sources_manager.py Show resolved Hide resolved
tests/integration/repo/test_apt_sources_manager.py Show resolved Hide resolved
@tigarmo tigarmo requested a review from bepri December 5, 2024 12:44
bepri
bepri approved these changes Dec 5, 2024
View reviewed changes
Copy link

@bepri bepri left a comment

Choose a reason for hiding this comment

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

looks good!

lengau
lengau approved these changes Dec 5, 2024
View reviewed changes
Copy link
Collaborator

@lengau lengau left a comment

Choose a reason for hiding this comment

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

Noice!

@lengau lengau merged commit 7a8d9eb into main Dec 5, 2024
9 checks passed
@lengau lengau deleted the work/CRAFT-3714-http-https branch December 5, 2024 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mr-cal mr-cal mr-cal approved these changes

@bepri bepri bepri approved these changes

@lengau lengau lengau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Key conflict on noble due to http vs https
4 participants
@tigarmo @lengau @bepri @mr-cal