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

firewall.py: fix encoding issue, remove prependline stuff

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-29 20:50:01 +02:00
parent 4101e0e041
commit 85e6ddbeae
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/firewall.py
View file

@ -31,7 +31,6 @@ from moulinette import m18n
from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.error import YunohostError, YunohostValidationError
from moulinette.utils import process from moulinette.utils import process
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from moulinette.utils.text import prependlines
FIREWALL_FILE = "/etc/yunohost/firewall.yml" FIREWALL_FILE = "/etc/yunohost/firewall.yml"
UPNP_CRON_JOB = "/etc/cron.d/yunohost-firewall-upnp" UPNP_CRON_JOB = "/etc/cron.d/yunohost-firewall-upnp"
@ -240,7 +239,7 @@ def firewall_reload(skip_upnp=False):
except process.CalledProcessError as e: except process.CalledProcessError as e:
logger.debug( logger.debug(
"iptables seems to be not available, it outputs:\n%s", "iptables seems to be not available, it outputs:\n%s",
prependlines(e.output.rstrip(), "> "), e.output.decode().strip(),
) )
logger.warning(m18n.n("iptables_unavailable")) logger.warning(m18n.n("iptables_unavailable"))
else: else:
@ -273,7 +272,7 @@ def firewall_reload(skip_upnp=False):
except process.CalledProcessError as e: except process.CalledProcessError as e:
logger.debug( logger.debug(
"ip6tables seems to be not available, it outputs:\n%s", "ip6tables seems to be not available, it outputs:\n%s",
prependlines(e.output.rstrip(), "> "), e.output.decode().strip(),
) )
logger.warning(m18n.n("ip6tables_unavailable")) logger.warning(m18n.n("ip6tables_unavailable"))
else: else:
@ -526,6 +525,6 @@ def _on_rule_command_error(returncode, cmd, output):
'"%s" returned non-zero exit status %d:\n%s', '"%s" returned non-zero exit status %d:\n%s',
cmd, cmd,
returncode, returncode,
prependlines(output.rstrip(), "> "), output.decode().strip(),
) )
return True return True