sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s4-dns: catch more expections in samba_dnsupdate

Browse Source
This commit is contained in:
Andrew Tridgell
2010-11-17 12:33:02 +11:00
parent d1c1aaeb8b
commit 60449d561d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/bin/samba_dnsupdate
View File

@ -259,11 +259,13 @@ def call_nsupdate(d):
try: try:
cmd = "%s %s" % (nsupdate_cmd, tmpfile) cmd = "%s %s" % (nsupdate_cmd, tmpfile)
subprocess.check_call(cmd, shell=True) subprocess.check_call(cmd, shell=True)
except subprocess.CalledProcessError: except Exception, estr:
global error_count global error_count
if opts.fail_immediately: if opts.fail_immediately:
sys.exit(1) sys.exit(1)
error_count = error_count + 1 error_count = error_count + 1
if opts.verbose:
print("Failed nsupdate: %s : %s" % (str(d), estr))
os.unlink(tmpfile) os.unlink(tmpfile)
@ -403,4 +405,6 @@ for d in update_list:
if ccachename is not None: if ccachename is not None:
os.unlink(ccachename) os.unlink(ccachename)
if error_count != 0:
print("Failed update of %u entries" % error_count)
sys.exit(error_count) sys.exit(error_count)