python: Handle LdbError thrown from functions operating on DNs

[samba.git] / python / samba / domain_update.py

diff --git a/python/samba/domain_update.py b/python/samba/domain_update.py
index ae5446a583701bf5ccdf8aac0303ec5ed5f9bce4..8493430089f6ef557f33a470fd33ff8c3ab82148 100644 (file)
--- a/python/samba/domain_update.py
+++ b/python/samba/domain_update.py
@@ -100,11 +100,15 @@ class DomainUpdate(object):
         self.domain_sid = security.dom_sid(samdb.get_domain_sid())
 
         self.domainupdate_container = self.samdb.get_root_basedn()
-        if not self.domainupdate_container.add_child("CN=Operations,CN=DomainUpdates,CN=System"):
+        try:
+            self.domainupdate_container.add_child("CN=Operations,CN=DomainUpdates,CN=System")
+        except ldb.LdbError:
             raise DomainUpdateException("Failed to add domain update container child")
 
         self.revision_object = self.samdb.get_root_basedn()
-        if not self.revision_object.add_child("CN=ActiveDirectoryUpdate,CN=DomainUpdates,CN=System"):
+        try:
+            self.revision_object.add_child("CN=ActiveDirectoryUpdate,CN=DomainUpdates,CN=System")
+        except ldb.LdbError:
             raise DomainUpdateException("Failed to add revision object child")
 
     def check_updates_functional_level(self, functional_level,