upgradeprovision: avoid working with None objects ...

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 39b5042da47699bca7e961e22700d8c60cc6c4a3..6697c821f970e8ddf68d72e57b67deb4a7809cd0 100755 (executable)
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -1657,15 +1657,16 @@ if __name__ == '__main__':
             doit = False
             if deltaattr is not None and len(deltaattr) > 1:
                 doit = True
-            deltaattr.remove("dn")
-            for att in deltaattr:
-                if att.lower() == "dn":
-                    continue
-                if deltaattr.get(att) is not None \
-                    and deltaattr.get(att).flags() != FLAG_MOD_ADD:
-                    doit = False
-                elif deltaattr.get(att) is None:
-                    doit = False
+            if doit:
+                deltaattr.remove("dn")
+                for att in deltaattr:
+                    if att.lower() == "dn":
+                        continue
+                    if deltaattr.get(att) is not None \
+                        and deltaattr.get(att).flags() != FLAG_MOD_ADD:
+                        doit = False
+                    elif deltaattr.get(att) is None:
+                        doit = False
             if doit:
                 message(CHANGE, "Applying delta to @ATTRIBUTES")
                 deltaattr.dn = ldb.Dn(basesam, "@ATTRIBUTES")