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

More yolofix to avoid openssl being re-upgraded right away after we downgrade it (gotta hold openssl during regular package upgrades)

Browse source
This commit is contained in:
Alexandre Aubin 2020-08-02 21:48:00 +02:00
parent b0efbb6bcf
commit 6e54424b9d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/tools.py
View file

@ -559,7 +559,7 @@ def tools_upgrade(operation_logger, apps=None, system=False, allow_yunohost_upgr
# Critical packages are packages that we can't just upgrade # Critical packages are packages that we can't just upgrade
# randomly from yunohost itself... upgrading them is likely to # randomly from yunohost itself... upgrading them is likely to
critical_packages = ["moulinette", "yunohost", "yunohost-admin", "ssowat"] critical_packages = ["moulinette", "yunohost", "yunohost-admin", "ssowat", "openssl"]
critical_packages_upgradable = [p["name"] for p in upgradables if p["name"] in critical_packages] critical_packages_upgradable = [p["name"] for p in upgradables if p["name"] in critical_packages]
noncritical_packages_upgradable = [p["name"] for p in upgradables if p["name"] not in critical_packages] noncritical_packages_upgradable = [p["name"] for p in upgradables if p["name"] not in critical_packages]
@ -614,6 +614,10 @@ def tools_upgrade(operation_logger, apps=None, system=False, allow_yunohost_upgr
operation_logger.error(m18n.n('packages_upgrade_failed')) operation_logger.error(m18n.n('packages_upgrade_failed'))
raise YunohostError(m18n.n('packages_upgrade_failed')) raise YunohostError(m18n.n('packages_upgrade_failed'))
# Mark all critical packages as unheld
for package in critical_packages:
check_output("apt-mark unhold %s" % package)
# #
# Critical packages upgrade # Critical packages upgrade
# #