git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1c1aae
)
s4-dns: catch more expections in samba_dnsupdate
author
Andrew Tridgell
<tridge@samba.org>
Wed, 17 Nov 2010 01:33:02 +0000
(12:33 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Wed, 17 Nov 2010 12:55:38 +0000
(23:55 +1100)
source4/scripting/bin/samba_dnsupdate
patch
|
blob
|
history
diff --git
a/source4/scripting/bin/samba_dnsupdate
b/source4/scripting/bin/samba_dnsupdate
index 9911c6ae26d27cb9a97b559bf6236ae526384b86..1b5bc3eb8a89d72f0d27512514e2a59fee88f3f0 100755
(executable)
--- 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.CalledProcessErro
r:
+ except
Exception, est
r:
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)