Compare commits

...

3 Commits

Author SHA1 Message Date
James Valleroy
e99c2f27fc
Release v25.9.3~bpo12+2 to bookworm-backports
Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
2025-08-11 21:17:23 -04:00
Sunil Mohan Adapa
05fce8c186
distupgrade: Update Trixie's release date as announced
Tests:

- Distribution upgrade page shows the updated date.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
2025-08-11 21:16:28 -04:00
Sunil Mohan Adapa
0bf14948b2
distupgrade: Handle comments in sources.list file
Tests:

- Add a comment and /etc/apt/sources.list file. Distribution upgrade page does
not load and fails with an error.

- With the patch, page loads properly. Distribution upgrade can be triggered.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
[jvalleroy: Fix test for release date]
Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
2025-08-11 21:16:20 -04:00
3 changed files with 13 additions and 2 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
freedombox (25.9.3~bpo12+2) bookworm-backports; urgency=medium
[ Sunil Mohan Adapa ]
* distupgrade: Handle comments in sources.list file
* distupgrade: Update Trixie's release date as announced
-- James Valleroy <jvalleroy@mailbox.org> Mon, 11 Aug 2025 21:16:53 -0400
freedombox (25.9.3~bpo12+1) bookworm-backports; urgency=medium
* Rebuild for bookworm-backports.

View File

@ -46,7 +46,7 @@ distribution_info: dict = {
'trixie': {
'version': 13,
'next': 'forky',
'release_date': datetime.datetime(2025, 8, 20, tzinfo=timezone.utc),
'release_date': datetime.datetime(2025, 8, 9, tzinfo=timezone.utc),
},
'forky': {
'version': 14,
@ -116,6 +116,9 @@ def _get_sources_list_codename() -> str | None:
dists = set()
for match_ in aug.match('*'):
dist = aug.get(match_ + '/distribution')
if not dist:
continue
dist = dist.removesuffix('-updates')
dist = dist.removesuffix('-security')
dists.add(dist)

View File

@ -190,7 +190,7 @@ def test_get_status(check_auto, is_dist_upgrade_enabled,
assert status['current_release_date'] == current_date
assert status['next_codename'] == 'trixie'
assert status['next_version'] == 13
next_date = datetime_original(2025, 8, 20, tzinfo=timezone.utc)
next_date = datetime_original(2025, 8, 9, tzinfo=timezone.utc)
assert status['next_release_date'] == next_date
assert status['next_action'] == 'manual'