Merge branch 'buster' into dev

This commit is contained in:
Alexandre Aubin 2022-08-14 19:42:48 +02:00
commit 71e9981c1a
2 changed files with 2 additions and 2 deletions

2
debian/changelog vendored
View file

@ -168,7 +168,7 @@ yunohost (11.0.2) testing; urgency=low
-- Alexandre Aubin <alex.aubin@mailoo.org> Wed, 19 Jan 2022 20:52:39 +0100
yunohost (4.4.2.4) stable; urgency=low
yunohost (4.4.2.5) stable; urgency=low
- [fix] bullseye migration: trash pip freeze stderr because it's confusing users ... (e68fc821)
- [fix] bullseye migration: add a check that there's at least 70MB available in /boot ... (02fcbd97)

View file

@ -201,7 +201,7 @@ class MyMigration(Migration):
# Another boring fix for the super annoying libc6-dev: Breaks libgcc-8-dev
# https://forum.yunohost.org/t/20617
#
if os.sytem("dpkg --list | grep '^ii' | grep -q ' libgcc-8-dev '") == 0 and os.system("LC_ALL=C apt policy libgcc-8-dev | grep Candidate | grep -q rpi"):
if os.system("dpkg --list | grep '^ii' | grep -q ' libgcc-8-dev '") == 0 and os.system("LC_ALL=C apt policy libgcc-8-dev | grep Candidate | grep -q rpi"):
logger.info("Attempting to fix the build-essential / libc6-dev / libgcc-8-dev hell ...")
os.system("cp /var/lib/dpkg/status /root/dpkg_status.bkp")
# This removes the dependency to build-essential from $app-ynh-deps