From 331e6f33d8f904470a7c1359a1c225d011c108a8 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sat, 17 Dec 2022 20:32:01 -0500 Subject: [PATCH] upgrades: dist-upgrade: Don't change apt security line This change was only needed for upgrade to bullseye. Closes: #2302. Tests: - Run a dist upgrade in a bullseye vagrant box. Apt sources has expected content and apt-get does not produce an error. Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- plinth/modules/upgrades/privileged.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plinth/modules/upgrades/privileged.py b/plinth/modules/upgrades/privileged.py index 17c044603..1573b3006 100644 --- a/plinth/modules/upgrades/privileged.py +++ b/plinth/modules/upgrades/privileged.py @@ -379,16 +379,12 @@ def _check_dist_upgrade(test_upgrade=False) -> Tuple[bool, str]: with open(SOURCES_LIST, 'w', encoding='utf-8') as sources_list: for line in lines: - # E.g. replace 'buster' with 'bullseye'. + # E.g. replace 'bullseye' with 'bookworm'. new_line = line.replace(dist, codename) if check_dist == 'testing': - # E.g. replace 'stable' with 'bullseye'. + # E.g. replace 'stable' with 'bookworm'. new_line = new_line.replace('stable', codename) - # Security suite name renamed starting with bullseye - if 'security' in new_line: - new_line = new_line.replace('/updates', '-security') - sources_list.write(new_line) logging.info('Dist upgrade in progress. Setting flag.')