s4:upgrade.py - readd accidentally removed empty lines
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Sat, 28 Nov 2009 15:59:18 +0000 (16:59 +0100)
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Sat, 28 Nov 2009 17:29:49 +0000 (18:29 +0100)
Jelmer pointed out that this is against the PEP8 norm

source4/scripting/python/samba/upgrade.py

index 205b43cf07d71e700953d65a38ded5ff1a3c3092..c26448c0e4c747a9eeaeb8a147f2c78605739529 100644 (file)
@@ -93,6 +93,7 @@ def import_sam_account(samldb,acc,domaindn,domainsid):
         "ntPwdHash:": acc.nt_password,
         })
 
         "ntPwdHash:": acc.nt_password,
         })
 
+
 def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn):
     """Upgrade a SAM group.
     
 def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn):
     """Upgrade a SAM group.
     
@@ -132,6 +133,7 @@ def import_sam_group(samldb, sid, gid, sid_name_use, nt_name, comment, domaindn)
         "samba3SidNameUse": str(sid_name_use)
         })
 
         "samba3SidNameUse": str(sid_name_use)
         })
 
+
 def import_idmap(samdb,samba3_idmap,domaindn):
     """Import idmap data.
 
 def import_idmap(samdb,samba3_idmap,domaindn):
     """Import idmap data.
 
@@ -156,6 +158,7 @@ def import_idmap(samdb,samba3_idmap,domaindn):
                           "type": "group",
                           "unixID": str(gid)})
 
                           "type": "group",
                           "unixID": str(gid)})
 
+
 def import_wins(samba4_winsdb, samba3_winsdb):
     """Import settings from a Samba3 WINS database.
     
 def import_wins(samba4_winsdb, samba3_winsdb):
     """Import settings from a Samba3 WINS database.
     
@@ -221,6 +224,7 @@ replace: @LIST
 
     samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
 
 
     samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
 
+
 smbconf_keep = [
     "dos charset", 
     "unix charset",
 smbconf_keep = [
     "dos charset", 
     "unix charset",