[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  05c1beb tdb: Bump version to 1.2.7 after addition of pytdb.__version__.
       via  a31e10e heimdal: Add local simpler copy of to_list().
      from  a3f61de Revert "s4:remove "util_ldb" submodule and integrate the three gendb_* calls in "dsdb/common/util.c""

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


- Log -----------------------------------------------------------------
commit 05c1beb6b47e607dac9850e81cef775a1d9b00ae
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 17 19:39:09 2010 +0200

    tdb: Bump version to 1.2.7 after addition of pytdb.__version__.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Oct 17 18:23:16 UTC 2010 on sn-devel-104

commit a31e10eab17e1ac7c766fde4b3840f7f597e3ba9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 16 19:01:18 2010 +0200

    heimdal: Add local simpler copy of to_list().

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

Summary of changes:
 lib/tdb/wscript                     |    2 +-
 source4/heimdal_build/wscript_build |   26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 6e00f3c..a1cae1f 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'tdb'
-VERSION = '1.2.6'
+VERSION = '1.2.7'
 
 blddir = 'bin'
 
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 448dec2..f07a8ef 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -1,14 +1,22 @@
 #!/usr/bin/env python
 
 import os
-from samba_utils import SET_TARGET_TYPE, TO_LIST
+from samba_utils import SET_TARGET_TYPE
 from samba_autoconf import CURRENT_CFLAGS
 
+def to_list(str):
+    '''Split a list, preserving quoted strings and existing lists'''
+    if str is None:
+        return []
+    if isinstance(str, list):
+        return str
+    return str.split(None)
+
 def heimdal_path(p):
     return os.path.join("../heimdal", p)
 
 def heimdal_paths(ps):
-    return [heimdal_path(p) for p in TO_LIST(ps)]
+    return [heimdal_path(p) for p in to_list(ps)]
 
 # waf build tool for building .et files with compile_et
 def HEIMDAL_ASN1(name, source,
@@ -47,7 +55,7 @@ def HEIMDAL_ASN1(name, source,
     cd_rule = 'cd ${TGT[0].parent.abspath(env)}'
     asn1_rule = cd_rule + ' && ${BLDBIN}/asn1_compile ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file ${SRC[0].abspath(env)} ${ASN1NAME}'
 
-    source = TO_LIST(source)
+    source = to_list(source)
     source.append('asn1_compile')
 
     if option_file is not None:
@@ -105,7 +113,7 @@ def HEIMDAL_ASN1(name, source,
 
     bld.set_group('main')
 
-    includes = TO_LIST(includes)
+    includes = to_list(includes)
     includes.append(os.path.dirname(out_files[0]))
 
     t = bld(features       = 'cc',
@@ -113,7 +121,7 @@ def HEIMDAL_ASN1(name, source,
             target         = name,
             samba_cflags   = CURRENT_CFLAGS(bld, name, ''),
             depends_on     = '',
-            samba_deps     = TO_LIST('roken replace'),
+            samba_deps     = to_list('roken replace'),
             samba_includes = includes + ["/usr/include/heimdal"],
             local_include  = True)
 
@@ -193,7 +201,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
         return
 
     # the library itself will depend on that object target
-    deps = TO_LIST(deps)
+    deps = to_list(deps)
     deps.append(obj_target)
 
     if not is_bundled:
@@ -262,7 +270,7 @@ def HEIMDAL_SUBSYSTEM(modname, source,
         target         = modname,
         samba_cflags   = CURRENT_CFLAGS(bld, modname, cflags),
         depends_on     = '',
-        samba_deps     = TO_LIST(deps),
+        samba_deps     = to_list(deps),
         samba_includes = includes,
         local_include  = True,
         local_include_first  = True,
@@ -305,7 +313,7 @@ def HEIMDAL_BINARY(binname, source,
     bld.set_group(group)
 
     # the binary itself will depend on that object target
-    deps = TO_LIST(deps)
+    deps = to_list(deps)
     deps.append(obj_target)
 
     t = bld(
@@ -576,7 +584,7 @@ HEIMDAL_SUBSYSTEM('HEIMDAL_CONFIG',
                   deps='HEIMDAL_HCRYPTO wind hx509'
                   )
 
-KRB5_SOURCE = [os.path.join('lib/krb5/', x) for x in TO_LIST(
+KRB5_SOURCE = [os.path.join('lib/krb5/', x) for x in to_list(
                                '''acache.c add_et_list.c
                                addr_families.c appdefault.c
                                asn1_glue.c auth_context.c


-- 
Samba Shared Repository