From 551e3a31a698b0fdeaa5581286402eb9a6442582 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 7 Dec 2021 15:56:54 +0100 Subject: [PATCH] Fixing class PpDeployZonesApp --- lib/pp_admintools/deploy_zones_from_pdns.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pp_admintools/deploy_zones_from_pdns.py b/lib/pp_admintools/deploy_zones_from_pdns.py index 988e3b3..bbc5b7c 100644 --- a/lib/pp_admintools/deploy_zones_from_pdns.py +++ b/lib/pp_admintools/deploy_zones_from_pdns.py @@ -31,6 +31,8 @@ from pytz import timezone, UnknownTimeZoneError # Own modules from fb_tools.common import pp, to_str, to_bool +from fb_tools.app import BaseApplication + from .pdns_app import PpPDNSAppError, PpPDNSApplication from .pidfile import PidFileError, PidFile @@ -461,15 +463,17 @@ class PpDeployZonesApp(PpPDNSApplication): LOG.info(_("Trying to get all keys from named.conf ...")) - LOG.info(_("Checking syntax correctness of named.conf ...")) cmd = shlex.split(str(self.cmd_checkconf)) cmd.append('-p') cmd_str = ' '.join(map(lambda x: pipes.quote(x), cmd)) LOG.debug(_("Executing: {}").format(cmd_str)) - result = self.run( + result = super(BaseApplication, self).run( cmd, stdout=PIPE, stderr=PIPE, timeout=10, check=True, may_simulate=False) + +# result = self.run( +# cmd, stdout=PIPE, stderr=PIPE, timeout=10, check=True, may_simulate=False) if self.verbose > 1: LOG.debug(_("Result:") + '\n' + str(result)) -- 2.39.5