debian/changelog

@@ -1,11 +1,3 @@
-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.

plinth/modules/upgrades/distupgrade.py

@@ -46,7 +46,7 @@ distribution_info: dict = {
     'trixie': {
         'version': 13,
         'next': 'forky',
-        'release_date': datetime.datetime(2025, 8, 9, tzinfo=timezone.utc),
+        'release_date': datetime.datetime(2025, 8, 20, tzinfo=timezone.utc),
     },
     'forky': {
         'version': 14,
@@ -116,9 +116,6 @@ 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)

plinth/modules/upgrades/tests/test_distupgrade.py

@@ -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, 9, tzinfo=timezone.utc)
+    next_date = datetime_original(2025, 8, 20, tzinfo=timezone.utc)
     assert status['next_release_date'] == next_date
     assert status['next_action'] == 'manual'