From b5fabc871bf0825e0acae16392c74bd593de86a4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Aug 2022 15:36:24 +0200 Subject: [PATCH] [fix] bullseye migration: a few annoying issues related to Sury --- .../data_migrations/0021_migrate_to_bullseye.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/yunohost/data_migrations/0021_migrate_to_bullseye.py b/src/yunohost/data_migrations/0021_migrate_to_bullseye.py index ee4ba65ea..94778f10d 100644 --- a/src/yunohost/data_migrations/0021_migrate_to_bullseye.py +++ b/src/yunohost/data_migrations/0021_migrate_to_bullseye.py @@ -104,9 +104,17 @@ class MyMigration(Migration): open("/etc/apt/sources.list.d/extra_php_version.list", "w").write( "deb https://packages.sury.org/php/ bullseye main" ) - os.system( - 'wget --timeout 900 --quiet "https://packages.sury.org/php/apt.gpg" --output-document=- | gpg --dearmor >"/etc/apt/trusted.gpg.d/extra_php_version.gpg"' - ) + + # Add Sury key even if extra_php_version.list was already there, + # because some old system may be using an outdated key not valid for Bullseye + # and that'll block the migration + os.system( + 'wget --timeout 900 --quiet "https://packages.sury.org/php/apt.gpg" --output-document=- | gpg --dearmor >"/etc/apt/trusted.gpg.d/extra_php_version.gpg"' + ) + + # Remove legacy, duplicated sury entry if it exists + if os.path.exists("/etc/apt/sources.list.d/sury.list"): + os.system("rm -rf /etc/apt/sources.list.d/sury.list") # # Get requirements of the different venvs from python apps