python/netcmd/dns: improve exception handling in cmd_delete_record()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index 6cf8d40b2aa698b9b603ca6760f989a4e1819e61..330e2efbdcdeb071bc057fb09ce0362e879f1023 100644 (file)
--- a/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
@@ -1067,7 +1067,9 @@ class cmd_delete_record(Command):
                                          del_rec_buf)
         except WERRORError as e:
             if e.args[0] == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
-                raise CommandError('Zone does not exist; record could not be deleted.')
+                raise CommandError('Zone does not exist; record could not be deleted. zone[%s] name[%s]' % (zone, name))
+            if e.args[0] == werror.WERR_DNS_ERROR_RECORD_DOES_NOT_EXIST:
+                raise CommandError('Record does not exist; record could not be deleted. zone[%s] name[%s]' % (zone, name))
             raise e
 
         self.outf.write('Record deleted successfully\n')