[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  6ed4544... build: enable python 3.0 and 3.1 in testwaf.sh
       via  ce67027... build: fixed wildcard handling for python 3.x
       via  ad32fab... s4-waf: fixed indentation for python 3.1
      from  a7b06f4... s3: Fix a memleak in check_pac_checksum

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


- Log -----------------------------------------------------------------
commit 6ed45442c4b7ea4e3b22aae3d574ca4149940dcc
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue May 4 11:58:28 2010 +0200

    build: enable python 3.0 and 3.1 in testwaf.sh
    
    try to ensure that we don't let support for python 3.x bitrot

commit ce67027c0705159d25ec616caf737736b4ea7ea8
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue May 4 11:57:50 2010 +0200

    build: fixed wildcard handling for python 3.x
    
    print must take parentheses

commit ad32fabc542f99f8501a0db4f9e2f32731931f1e
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue May 4 11:57:13 2010 +0200

    s4-waf: fixed indentation for python 3.1
    
    python 3.x is very fussy about tabs/spaces

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

Summary of changes:
 buildtools/testwaf.sh                 |    3 +--
 buildtools/wafsamba/samba_wildcard.py |    2 +-
 lib/nss_wrapper/wscript               |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/testwaf.sh b/buildtools/testwaf.sh
index b0771bb..b6f8db1 100755
--- a/buildtools/testwaf.sh
+++ b/buildtools/testwaf.sh
@@ -46,8 +46,7 @@ done
 
 echo "testing python portability"
 pushd lib/talloc
-#versions="python2.4 python2.5 python2.6 python3.0 python3.1"
-versions="python2.4 python2.5 python2.6"
+versions="python2.4 python2.5 python2.6 python3.0 python3.1"
 for p in $versions; do
     echo "Testing $p"
     $p ../../buildtools/bin/waf configure -C --enable-developer --prefix=$PREFIX
diff --git a/buildtools/wafsamba/samba_wildcard.py b/buildtools/wafsamba/samba_wildcard.py
index bcacb4f..ecf3498 100644
--- a/buildtools/wafsamba/samba_wildcard.py
+++ b/buildtools/wafsamba/samba_wildcard.py
@@ -28,7 +28,7 @@ def run_named_build_task(cmd):
 					relpath = k.relpath_gen(cwd_node)
 					if fnmatch.fnmatch(relpath, cmd):
 						t.position= [0,0]
-						print t.display()
+						print(t.display())
 						run_task(t, k)
 						return
 
diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript
index 4b3ec44..2ab72ef 100644
--- a/lib/nss_wrapper/wscript
+++ b/lib/nss_wrapper/wscript
@@ -4,7 +4,7 @@ import Options
 
 def set_options(opt):
 	gr = opt.option_group('developer options')
-        gr.add_option('--enable-nss-wrapper',
+	gr.add_option('--enable-nss-wrapper',
 		      help=("Turn on nss wrapper library (default=no)"),
 		      action="store_true", dest='enable_nss_wrapper', default=False)
 


-- 
Samba Shared Repository