From: Matthieu Patou Date: Sat, 4 Sep 2010 22:58:31 +0000 (+0400) Subject: upgradeprovision: cleanup X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=13d575d6e320961153d7071bc4f9b5cccdfb71b6;p=mat%2Fsamba.git upgradeprovision: cleanup --- 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):