[SCM] Samba Shared Repository - branch master updated

Martin Schwenke martins at samba.org
Sat Oct 29 07:33:03 UTC 2016


The branch, master has been updated
       via  da67acb build: Fix build with perl on debian sid.
      from  baf47ee s3-waf: Move spoolssd into its own subsystem

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


- Log -----------------------------------------------------------------
commit da67acbcfe2167fce9c360a55416ab10e9537a2a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Oct 26 00:06:12 2016 +1300

    build: Fix build with perl on debian sid.
    
    build: Fix build with perl on debian sid.
    
    It appears that "." is no longer in perl_inc
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12395
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Sat Oct 29 09:32:37 CEST 2016 on sn-devel-144

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

Summary of changes:
 buildtools/wafsamba/samba_perl.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_perl.py b/buildtools/wafsamba/samba_perl.py
index f2f176d..2e9a53a 100644
--- a/buildtools/wafsamba/samba_perl.py
+++ b/buildtools/wafsamba/samba_perl.py
@@ -49,7 +49,8 @@ def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)):
     conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir
 
     perl_inc = read_perl_config_var('print "@INC"')
-    perl_inc.remove('.')
+    if '.' in perl_inc:
+        perl_inc.remove('.')
     conf.start_msg("PERL_INC: ")
     conf.end_msg("%s" % (perl_inc), 'GREEN')
     conf.env.PERL_INC = perl_inc


-- 
Samba Shared Repository



More information about the samba-cvs mailing list