projects
/
dyn-nsupdate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client script: show old value in the change notification
[dyn-nsupdate.git]
/
client-scripts
/
dyn-ns-client
diff --git
a/client-scripts/dyn-ns-client
b/client-scripts/dyn-ns-client
index 78a68541d9905b082028342a24576ff12b6c0f50..03835d48cac2a7f259dff20100e8371edb54f9e7 100755
(executable)
--- a/
client-scripts/dyn-ns-client
+++ b/
client-scripts/dyn-ns-client
@@
-50,7
+50,10
@@
def getConfigDir():
return os.path.expanduser("~/.config/dyn-nsupdate")
def urlopen(url, config):
return os.path.expanduser("~/.config/dyn-nsupdate")
def urlopen(url, config):
- return urllib.request.urlopen(url, context=sslContext(config)).read().decode('utf-8').strip()
+ if sys.version_info >= (3, 4, 3):
+ return urllib.request.urlopen(url, context=sslContext(config)).read().decode('utf-8').strip()
+ else:
+ return urllib.request.urlopen(url).read().decode('utf-8').strip()
def getMyIP(family, config, methods = {}, verbose = 0):
'''Returns our current IP address (<family> can be "IPv4" or "IPv6"), detected as given by the configuration.
def getMyIP(family, config, methods = {}, verbose = 0):
'''Returns our current IP address (<family> can be "IPv4" or "IPv6"), detected as given by the configuration.
@@
-140,9
+143,9
@@
def updateDomain(server, domain, ipv4, ipv6, password, config, verbose):
if verbose >= VERBOSE_CHANGE:
msg = "Successfully updated domain {} on {}:".format(domain, server)
if ipv4 is not None:
if verbose >= VERBOSE_CHANGE:
msg = "Successfully updated domain {} on {}:".format(domain, server)
if ipv4 is not None:
- msg += " IPv4={}
".format(
ipv4)
+ msg += " IPv4={}
-> {}".format(curIPv4,
ipv4)
if ipv6 is not None:
if ipv6 is not None:
- msg += " IPv6={}
".format(
ipv6)
+ msg += " IPv6={}
-> {}".format(curIPv6,
ipv6)
print(msg)
# all went all right
return True
print(msg)
# all went all right
return True