This commit is contained in:
Alexandre Aubin 2019-04-24 03:23:47 +02:00
parent 12bcd5d0f8
commit 5731e69541

View file

@ -34,12 +34,8 @@ from glob import glob
from xmlrpclib import Fault from xmlrpclib import Fault
from importlib import import_module from importlib import import_module
from collections import OrderedDict from collections import OrderedDict
from datetime import datetime
import apt from moulinette import msignals, m18n
import apt.progress
from moulinette import msettings, msignals, m18n
from moulinette.core import init_authenticator from moulinette.core import init_authenticator
from yunohost.utils.error import YunohostError from yunohost.utils.error import YunohostError
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
@ -49,7 +45,7 @@ from yunohost.app import app_fetchlist, app_info, app_upgrade, app_ssowatconf, a
from yunohost.domain import domain_add, domain_list, _get_maindomain, _set_maindomain from yunohost.domain import domain_add, domain_list, _get_maindomain, _set_maindomain
from yunohost.dyndns import _dyndns_available, _dyndns_provides from yunohost.dyndns import _dyndns_available, _dyndns_provides
from yunohost.firewall import firewall_upnp from yunohost.firewall import firewall_upnp
from yunohost.service import service_status, service_log, service_start, service_enable from yunohost.service import service_status, service_start, service_enable
from yunohost.regenconf import regen_conf from yunohost.regenconf import regen_conf
from yunohost.monitor import monitor_disk, monitor_system from yunohost.monitor import monitor_disk, monitor_system
from yunohost.utils.packages import ynh_packages_version from yunohost.utils.packages import ynh_packages_version
@ -496,6 +492,7 @@ def tools_update(apps=False, system=False):
# Filter boring message about "apt not having a stable CLI interface" # Filter boring message about "apt not having a stable CLI interface"
# Also keep track of wether or not we encountered a warning... # Also keep track of wether or not we encountered a warning...
warnings = [] warnings = []
def is_legit_warning(m): def is_legit_warning(m):
legit_warning = m.rstrip() and "apt does not have a stable CLI interface" not in m.rstrip() legit_warning = m.rstrip() and "apt does not have a stable CLI interface" not in m.rstrip()
if legit_warning: if legit_warning: