Cosmetics

diff --git a/pp_lib/config_named_app.py b/pp_lib/config_named_app.py
index 8cd320964b3b67c49e6ea229b311d3fb19647107..4f5ebbf8566f8bcfed3f6db944752d8a57b1df74 100644 (file)
--- a/pp_lib/config_named_app.py
+++ b/pp_lib/config_named_app.py
@@ -32,7 +32,7 @@ from .common import pp, to_bool, to_bytes
 
 from .cfg_app import PpCfgAppError, PpConfigApplication
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 LOG = logging.getLogger(__name__)
 
 
@@ -442,16 +442,17 @@ class PpConfigNamedApp(PpConfigApplication):
                 if prefix:
                     uni_name = 'rev.' + prefix
 
-            match = self.re_ipv6_zone.search(zone_name)
-            if match:
-                prefix = self._get_ipv6_prefix(match.group(1))
-                if prefix:
-                    uni_name = 'rev.' + prefix
+            if not uni_name:
+                match = self.re_ipv6_zone.search(zone_name)
+                if match:
+                    prefix = self._get_ipv6_prefix(match.group(1))
+                    if prefix:
+                        uni_name = 'rev.' + prefix
 
             if not uni_name:
                 uni_name = zone_name.encode('utf-8').decode('idna')
 
-            zone['canoniical_name'] = uni_name
+            zone['canonical_name'] = uni_name
 
             self.zones[zone_name] = zone
 
@@ -465,7 +466,8 @@ class PpConfigNamedApp(PpConfigApplication):
         for t in match.split('.'):
             if t:
                 tuples.insert(0, t)
-        LOG.debug("Got IPv4 tuples: {}".format(pp(tuples)))
+        if self.verbose > 2:
+            LOG.debug("Got IPv4 tuples: {}".format(pp(tuples)))
         return '.'.join(tuples)
 
     # -------------------------------------------------------------------------
@@ -475,7 +477,6 @@ class PpConfigNamedApp(PpConfigApplication):
         for t in match.split('.'):
             if t:
                 tuples.insert(0, t)
-        LOG.debug("Got IPv6 tuples: {}".format(pp(tuples)))
 
         tokens = []
         while len(tuples):
@@ -489,6 +490,9 @@ class PpConfigNamedApp(PpConfigApplication):
             tokens.append(token)
             del tuples[0:4]
 
+        if self.verbose > 2:
+            LOG.debug("Got IPv6 tokens: {}".format(pp(tokens)))
+
         return ':'.join(tokens)
 
 # =============================================================================