From 05b2d4147a75a652f8f773d353b62a4c10821155 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Wed, 15 Jun 2011 15:20:46 +0400 Subject: [PATCH] s4-upgradeprovision: deltaattr can be empty or none too --- source4/scripting/bin/upgradeprovision | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 284b0e0ef83..9bf09bd432e 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -1808,14 +1808,14 @@ if __name__ == '__main__': doit = True 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 + 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") -- 2.11.4.GIT