upgradeprovision: cleanup
authorMatthieu Patou <mat@matws.net>
Sat, 4 Sep 2010 22:58:31 +0000 (02:58 +0400)
committerMatthieu Patou <mat@matws.net>
Sun, 5 Sep 2010 08:29:20 +0000 (12:29 +0400)
source4/scripting/bin/upgradeprovision

index 2bae4b9c235cc9e96ba62311e75a8e6314f8403d..046474ff5d1e8540a9e3fb3a8b8598d97a3a2392 100755 (executable)
@@ -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):