prettier printing
[dyn-nsupdate.git] / client-scripts / dyn-ns-client
index 0e96bedb792e34cb79c35164eb240ebb7a94949a..11e45127d2430a8ab7da2fd6d930bb70b940fa07 100755 (executable)
@@ -61,6 +61,8 @@ def getMyIP(family, config, methods = {}, verbose = 0):
     method = config[family]['method']
     if method == 'none':
         return None
     method = config[family]['method']
     if method == 'none':
         return None
+    elif method == 'remove':
+        return ""
     elif method == 'web':
         server = config[family].get('server', config['DEFAULT']['server'])
         url = 'https://'+server+'/checkip'
     elif method == 'web':
         server = config[family].get('server', config['DEFAULT']['server'])
         url = 'https://'+server+'/checkip'
@@ -151,6 +153,8 @@ def updateDomain(server, domain, ipv4, ipv6, password, config, verbose):
                     msg += " IPv4={} (unchanged)".format(curIPv4)
                 else:
                     msg += " IPv4={} -> {}".format(curIPv4, ipv4)
                     msg += " IPv4={} (unchanged)".format(curIPv4)
                 else:
                     msg += " IPv4={} -> {}".format(curIPv4, ipv4)
+            if ipv4 is not None and ipv6 is not None:
+                msg += ","
             if ipv6 is not None:
                 if curIPv6 == ipv6:
                     msg += " IPv6={} (unchanged)".format(curIPv6)
             if ipv6 is not None:
                 if curIPv6 == ipv6:
                     msg += " IPv6={} (unchanged)".format(curIPv6)