diff options
| author | Matthieu Patou <mat@matws.net> | 2011-06-15 15:20:46 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@samba.org> | 2011-06-19 23:21:08 +0200 |
| commit | 05b2d4147a75a652f8f773d353b62a4c10821155 (patch) | |
| tree | 9a8bcc141306a9946764267161bcc86eb0c619bf | |
| parent | 12b379e9831131c251fde3ebebb76b00323f6bf0 (diff) | |
| download | samba-05b2d4147a75a652f8f773d353b62a4c10821155.tar.gz samba-05b2d4147a75a652f8f773d353b62a4c10821155.tar.bz2 samba-05b2d4147a75a652f8f773d353b62a4c10821155.zip | |
s4-upgradeprovision: deltaattr can be empty or none too
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 284b0e0ef8..9bf09bd432 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") |