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

Yes, we don't give a flying fuck that sudo-ldap is already provided

Browse source
This commit is contained in:
Alexandre Aubin 2020-06-19 19:02:02 +02:00
parent 5a87fea596
commit c473902776
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/tools.py
View file

@ -593,12 +593,17 @@ def tools_upgrade(operation_logger, apps=None, system=False, allow_yunohost_upgr
logger.debug("Running apt command :\n{}".format(dist_upgrade)) logger.debug("Running apt command :\n{}".format(dist_upgrade))
def is_relevant(l): def is_relevant(l):
return "Reading database ..." not in l.rstrip() irrelevants = [
"service sudo-ldap already provided",
"Reading database ..."
]
return all(i not in l.rstrip() for i in irrelevants)
callbacks = ( callbacks = (
lambda l: logger.info("+ " + l.rstrip() + "\r") if is_relevant(l) else logger.debug(l.rstrip() + "\r"), lambda l: logger.info("+ " + l.rstrip() + "\r") if is_relevant(l) else logger.debug(l.rstrip() + "\r"),
lambda l: logger.warning(l.rstrip()), lambda l: logger.warning(l.rstrip()) if is_relevant(l) else logger.debug(l.rstrip()),
) )
returncode = call_async_output(dist_upgrade, callbacks, shell=True) returncode = call_async_output(dist_upgrade, callbacks, shell=True)
if returncode != 0: if returncode != 0: