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

Update to deb822-sources for bookworm (previously sid-only) #142

Merged
merged 1 commit into from
Feb 1, 2023

Conversation

tianon
Copy link
Collaborator

@tianon tianon commented Sep 16, 2022

This is the inevitable follow-up to #128

@julian-klode I'd love to hear your thoughts on whether you think we're ready to go to this next stage? 🙇
(I haven't heard of much bad breakage, but I imagine you're closer to where those might occur than I am 😅)

@tianon
Copy link
Collaborator Author

tianon commented Sep 17, 2022

`diffoscope` output for affected CI job:
@@ -102,16 +102,16 @@
 -rw-r--r--   0        0        0      754 2022-06-30 00:00:00.000000 etc/apt/apt.conf.d/docker-autoremove-suggests
 -rw-r--r--   0        0        0     1175 2022-06-30 00:00:00.000000 etc/apt/apt.conf.d/docker-clean
 -rw-r--r--   0        0        0      481 2022-06-30 00:00:00.000000 etc/apt/apt.conf.d/docker-gzip-indexes
 -rw-r--r--   0        0        0      269 2022-06-30 00:00:00.000000 etc/apt/apt.conf.d/docker-no-languages
 drwxr-xr-x   0        0        0        0 2022-05-17 16:50:45.000000 etc/apt/auth.conf.d/
 drwxr-xr-x   0        0        0        0 2022-05-17 16:50:45.000000 etc/apt/keyrings/
 drwxr-xr-x   0        0        0        0 2022-05-17 16:50:45.000000 etc/apt/preferences.d/
--rw-r--r--   0        0        0      430 2022-06-30 00:00:00.000000 etc/apt/sources.list
 drwxr-xr-x   0        0        0        0 2022-06-30 00:00:00.000000 etc/apt/sources.list.d/
+-rw-r--r--   0        0        0      443 2022-06-30 00:00:00.000000 etc/apt/sources.list.d/debian.sources
 drwxr-xr-x   0        0        0        0 2022-06-30 00:00:00.000000 etc/apt/trusted.gpg.d/
 -rw-r--r--   0        0        0     8700 2021-02-25 17:38:08.000000 etc/apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg
 -rw-r--r--   0        0        0     8709 2021-02-25 17:38:08.000000 etc/apt/trusted.gpg.d/debian-archive-bullseye-security-automatic.gpg
 -rw-r--r--   0        0        0     2453 2021-02-25 17:38:08.000000 etc/apt/trusted.gpg.d/debian-archive-bullseye-stable.gpg
 -rw-r--r--   0        0        0     8132 2021-02-25 17:38:08.000000 etc/apt/trusted.gpg.d/debian-archive-buster-automatic.gpg
 -rw-r--r--   0        0        0     8141 2021-02-25 17:38:08.000000 etc/apt/trusted.gpg.d/debian-archive-buster-security-automatic.gpg
 -rw-r--r--   0        0        0     2332 2021-02-25 17:38:08.000000 etc/apt/trusted.gpg.d/debian-archive-buster-stable.gpg

(as expected 👍)

@tianon tianon force-pushed the deb822-bookworm branch 4 times, most recently from fcb9acb to 0495b94 Compare September 18, 2022 03:15
@tianon
Copy link
Collaborator Author

tianon commented Sep 18, 2022

I've updated to combine "deb822" and "usr-is-merged" tests since their timestamps are so close together. 😅

@julian-klode
Copy link

Presumably we should have the new apt.sources module and deprecation of aptsources done first before switching this, but not sure.

This moved from 22.10 to 23.04.

@tianon
Copy link
Collaborator Author

tianon commented Sep 26, 2022

Ah yeah, totally makes sense! Thanks for the update/consideration ❤️

@tianon tianon marked this pull request as draft September 28, 2022 23:59
@tianon
Copy link
Collaborator Author

tianon commented Jan 17, 2023

python-apt 2.5.1 includes this:

   * aptsources: Initial deb822 reading, use SourcesList(..., deb822=True) to opt in.
     The .distro matcher code has not been fully ported yet, and you will
     experience issues trying to match distro entries to a deb822 source entry
     with multiple values in the Types, URIs, Suites field, but this should
     work for most use cases.

I think this was the last real blocker to moving forward with bookworm, so once this hits testing we're probably solid. 👀

@tianon
Copy link
Collaborator Author

tianon commented Jan 26, 2023

Also, combine "deb822" and "usr-is-merged" tests since their timestamps are so close together.
@tianon tianon marked this pull request as ready for review January 27, 2023 00:47
@tianon
Copy link
Collaborator Author

tianon commented Feb 1, 2023

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