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

Reorganize for clarity

Browse source
This commit is contained in:
Alexandre Aubin 2019-04-22 23:25:57 +02:00
parent 68ac7d3f1c
commit 1b84d9a65f
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/yunohost/tools.py
View file

@ -602,6 +602,23 @@ def tools_upgrade(operation_logger, auth, apps=None, system=False):
# TODO : i18n # TODO : i18n
raise YunohostError("Please specify --apps OR --system") raise YunohostError("Please specify --apps OR --system")
#
# Apps
# This is basically just an alias to yunohost app upgrade ...
#
if apps is not None:
try:
app_upgrade(auth, app=apps)
except Exception as e:
logger.warning('unable to upgrade apps: %s' % str(e))
logger.error(m18n.n('app_upgrade_some_app_failed'))
#
# System
#
if system is True: if system is True:
# Check that there's indeed some packages to upgrade # Check that there's indeed some packages to upgrade
@ -671,6 +688,7 @@ def tools_upgrade(operation_logger, auth, apps=None, system=False):
# Mark all critical packages as unheld # Mark all critical packages as unheld
for package in critical_packages: for package in critical_packages:
check_output("apt-mark unhold %s" % package) check_output("apt-mark unhold %s" % package)
# Doublecheck with apt-mark showhold that packages are indeed unheld ... # Doublecheck with apt-mark showhold that packages are indeed unheld ...
unheld_packages = check_output("apt-mark showhold").split("\n") unheld_packages = check_output("apt-mark showhold").split("\n")
if any(p in unheld_packages for p in critical_packages): if any(p in unheld_packages for p in critical_packages):
@ -716,14 +734,6 @@ def tools_upgrade(operation_logger, auth, apps=None, system=False):
operation_logger.success() operation_logger.success()
if apps is not None:
try:
app_upgrade(auth, app=apps)
except Exception as e:
logger.warning('unable to upgrade apps: %s' % str(e))
logger.error(m18n.n('app_upgrade_some_app_failed'))
def tools_diagnosis(auth, private=False): def tools_diagnosis(auth, private=False):
""" """
Return global info about current yunohost instance to help debugging Return global info about current yunohost instance to help debugging