]> Frank Brehm's Git Trees - pixelpark/pp-admin-tools.git/commitdiff
Fixing class PpDeployZonesApp
authorFrank Brehm <frank@brehm-online.com>
Tue, 7 Dec 2021 14:59:32 +0000 (15:59 +0100)
committerFrank Brehm <frank@brehm-online.com>
Tue, 7 Dec 2021 14:59:32 +0000 (15:59 +0100)
lib/pp_admintools/deploy_zones_from_pdns.py

index bbc5b7c823923781f92005c9b841f3195bc243ec..44e26c062fc12b4a8b5d3a41ddce47a93355174d 100644 (file)
@@ -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)