YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

bullseye migration: simplify code, we can suffix packages with '-' to mean that we want to remove them during apt install call

Browse source
This commit is contained in:
Alexandre Aubin 2022-08-15 15:49:43 +02:00
parent 18ea57a8cc
commit d03abcc73c
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/data_migrations/0021_migrate_to_bullseye.py
View file

@ -206,9 +206,9 @@ class MyMigration(Migration):
os.system("cp /var/lib/dpkg/status /root/dpkg_status.bkp")
# This removes the dependency to build-essential from $app-ynh-deps
os.system("perl -i~ -0777 -pe 's/(Package: .*-ynh-deps\\n(.+:.+\\n)+Depends:.*)(build-essential, ?)(.*)/$1$4/g' /var/lib/dpkg/status")
self.apt("build-essential", verb="remove")
self.apt_install("build-essential-") # Note the '-' suffix to mean that we actually want to remove the packages
os.system("LC_ALL=C DEBIAN_FRONTEND=noninteractive APT_LISTCHANGES_FRONTEND=none apt autoremove --assume-yes")
self.apt("gcc-8 libgcc-8-dev", verb="remove")
self.apt_install("gcc-8- libgcc-8-dev-") # Note the '-' suffix to mean that we actually want to remove the packages
#
# Main upgrade
@ -489,9 +489,6 @@ class MyMigration(Migration):
os.system(f"apt-mark unhold {package}")
def apt_install(self, cmd):
return self.apt(cmd, verb="install")
def apt(self, cmd, verb="install"):
def is_relevant(line):
return "Reading database ..." not in line.rstrip()
@ -505,7 +502,7 @@ class MyMigration(Migration):
)
cmd = (
f"LC_ALL=C DEBIAN_FRONTEND=noninteractive APT_LISTCHANGES_FRONTEND=none apt {verb} --quiet -o=Dpkg::Use-Pty=0 --fix-broken --assume-yes "
f"LC_ALL=C DEBIAN_FRONTEND=noninteractive APT_LISTCHANGES_FRONTEND=none apt install --quiet -o=Dpkg::Use-Pty=0 --fix-broken --assume-yes "
+ cmd
)