From c7fa030aecd1de5ed32e2509ecd83828aa42c1a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Jacke?= Date: Sun, 25 Aug 2019 23:10:19 +0200 Subject: [PATCH] scripting: avoid inefficient string redefinition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjoern Jacke Reviewed-by: Matthias Dieter Wallnöfer --- source4/scripting/bin/samba_upgradeprovision | 8 ++------ source4/scripting/devel/config_base | 9 ++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index 6d484b750da..6f4de4ee255 100755 --- a/source4/scripting/bin/samba_upgradeprovision +++ b/source4/scripting/bin/samba_upgradeprovision @@ -1063,14 +1063,10 @@ def reload_full_schema(samdb, names): schemadn = str(names.schemadn) current = samdb.search(expression="objectClass=*", base=schemadn, scope=SCOPE_SUBTREE) - schema_ldif = "" - prefixmap_data = "" - for ent in current: - schema_ldif += samdb.write_ldif(ent, ldb.CHANGETYPE_NONE) + schema_ldif = "".join(samdb.write_ldif(ent, ldb.CHANGETYPE_NONE) for ent in current) - prefixmap_data = open(setup_path("prefixMap.txt"), 'rb').read() - prefixmap_data = b64encode(prefixmap_data).decode('utf8') + prefixmap_data = b64encode(open(setup_path("prefixMap.txt"), 'rb').read()).decode('utf8') # We don't actually add this ldif, just parse it prefixmap_ldif = "dn: %s\nprefixMap:: %s\n\n" % (schemadn, prefixmap_data) diff --git a/source4/scripting/devel/config_base b/source4/scripting/devel/config_base index 1aa436de1a5..f593f2f627d 100755 --- a/source4/scripting/devel/config_base +++ b/source4/scripting/devel/config_base @@ -30,11 +30,10 @@ if not os.path.isdir(config_dir): if not os.path.isfile(config_file): open(config_file, mode='w').close() -options = " --configfile=${PREFIX}/etc/smb.conf" +options = ( + " --configfile=${PREFIX}/etc/smb.conf" + "".join(" --option=%s=%s" % (v.replace(" ",""), vars[v]) for v in vars) + ).replace("${PREFIX}", prefix) -for v in vars: - options += " --option=%s=%s" % (v.replace(" ",""), vars[v]) - -options = options.replace("${PREFIX}", prefix) print(options) -- 2.47.3