[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  b6efa15 heimdal-build: Avoid using python str.format()
      from  cf7e771 Fix pdb_samba_dsdb build on Ubuntu 16.04 with -O3 -Werror=strict-overflow

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b6efa1507c38d316e8cf05025b47a555ca0d0d0a
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Sep 19 18:31:34 2018 +1000

    heimdal-build: Avoid using python str.format()
    
    In python 2.6, the format fields need to be numbered explicitly.  This
    causes the build to fail on RHEL6/Centos6 with following error:
    
     File "/home/amitay/samba.git/source4/heimdal_build/wscript_build", line 87, in HEIMDAL_ASN1
        os.path.join(bld.path.abspath(), option_file)))
    ValueError: zero length field name in format
    
    To use str.format() in HEIMDAL_ASN1(),
    
       "--option-file='{}'"  needs to be   "--options-file='{0}'"
    
    Or this fix which avoids str.format() completely.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Fri Sep 21 03:06:44 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source4/heimdal_build/wscript_build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index a0572e4..45938b8 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -82,9 +82,8 @@ def HEIMDAL_ASN1(name, source,
     t.env.ASN1OPTIONS  = options
     t.env.BLDBIN       = os.path.normpath(os.path.join(bld.srcnode.abspath(bld.env), '..'))
     if option_file is not None:
-        t.env.OPTION_FILE = "--option-file='{}'".format(
-                os.path.normpath(
-                    os.path.join(bld.path.abspath(), option_file)))
+        t.env.OPTION_FILE = "--option-file='%s'" % \
+            os.path.normpath(os.path.join(bld.path.abspath(), option_file))
 
     cfile = out_files[0][0:-2] + '.c'
     hfile = out_files[1][0:-3] + '.h'


-- 
Samba Shared Repository