diff options
| author | Matthieu Patou <mat@matws.net> | 2010-09-05 02:58:31 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@matws.net> | 2010-09-05 12:29:20 +0400 |
| commit | 13d575d6e320961153d7071bc4f9b5cccdfb71b6 (patch) | |
| tree | 0c81954265fd356b543cb715b4c9c2389925d34f | |
| parent | 1d0815281e41cb1ca2cf72a3dba28a9ca75fb65d (diff) | |
| download | samba-13d575d6e320961153d7071bc4f9b5cccdfb71b6.tar.gz samba-13d575d6e320961153d7071bc4f9b5cccdfb71b6.tar.bz2 samba-13d575d6e320961153d7071bc4f9b5cccdfb71b6.zip | |
upgradeprovision: cleanup
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 2bae4b9c23..046474ff5d 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -456,7 +456,6 @@ def handle_special_add(samdb, dn, names): #This entry was misplaced lets remove it if it exists dntoremove = "CN=Certificate Service DCOM Access,"\ "CN=Users, %s" % names.rootdn - print dntoremove objDn = Dn(samdb, "CN=Cryptographic Operators, CN=Builtin, %s" % names.rootdn) if dn == objDn: @@ -687,8 +686,9 @@ def add_missing_entries(ref_samdb, samdb, names, basedn, list): # DN can't be created because it depends on some # other DN in the list listDefered.append(dn) + if len(listDefered) != 0: - raise ProvisioningError("Unable to insert missing elements:" \ + raise ProvisioningError("Unable to insert missing elements:" "circular references") def handle_links(samdb, att, basedn, dn, value, ref_value, delta): |