From: Frank Brehm Date: Tue, 7 Dec 2021 14:59:32 +0000 (+0100) Subject: Fixing class PpDeployZonesApp X-Git-Tag: 0.4.1~5^2~8 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=db928044d1604f2488c27c172318896a82761b73;p=pixelpark%2Fpp-admin-tools.git Fixing class PpDeployZonesApp --- diff --git a/lib/pp_admintools/deploy_zones_from_pdns.py b/lib/pp_admintools/deploy_zones_from_pdns.py index bbc5b7c..44e26c0 100644 --- a/lib/pp_admintools/deploy_zones_from_pdns.py +++ b/lib/pp_admintools/deploy_zones_from_pdns.py @@ -472,14 +472,12 @@ class PpDeployZonesApp(PpPDNSApplication): 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)) config = result.stdout - key_pattern = r'^\s*key\s+("[^"]+"|\S+)\s+\{([^\}]+\}\s*;' + key_pattern = r'^\s*key\s+("[^"]+"|\S+)\s+\{([^\}]+)\}\s*;' re_quotes = re.compile(r'^\s*"([^"]+)"\s*$') re_key = re.compile(key_pattern, re.IGNORECASE | re.MULTILINE | re.DOTALL)