From 60449d561dd4fdbe5ea9368ea59ef4e8bfa7b420 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Nov 2010 12:33:02 +1100 Subject: s4-dns: catch more expections in samba_dnsupdate --- source4/scripting/bin/samba_dnsupdate | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index 9911c6ae26..1b5bc3eb8a 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -259,11 +259,13 @@ def call_nsupdate(d): try: cmd = "%s %s" % (nsupdate_cmd, tmpfile) subprocess.check_call(cmd, shell=True) - except subprocess.CalledProcessError: + except Exception, estr: global error_count if opts.fail_immediately: sys.exit(1) error_count = error_count + 1 + if opts.verbose: + print("Failed nsupdate: %s : %s" % (str(d), estr)) os.unlink(tmpfile) @@ -403,4 +405,6 @@ for d in update_list: if ccachename is not None: os.unlink(ccachename) +if error_count != 0: + print("Failed update of %u entries" % error_count) sys.exit(error_count) -- cgit