[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  4f48a28 build: fixed 'make dist' without configuring
       via  0a6e0ed build: don't display expected duplicate symbols
      from  2296871 Torture test added to run_opentest() to ensure we don't regress on the previous change.

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


- Log -----------------------------------------------------------------
commit 4f48a28c3c47d43c962cfa2a9374f6860ed28591
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Feb 23 17:10:10 2011 +1100

    build: fixed 'make dist' without configuring
    
    this finds git inside samba_version.py
    
    thanks to Simo for noticing this problem
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Wed Feb 23 07:55:28 CET 2011 on sn-devel-104

commit 0a6e0edc047e6ec4b4fe9483f9961fff6b7061f9
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Feb 23 17:05:47 2011 +1100

    build: don't display expected duplicate symbols

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

Summary of changes:
 buildtools/wafsamba/samba_version.py |    6 +++++-
 buildtools/wafsamba/symbols.py       |    7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 4fe280e..0b0c159 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -52,6 +52,10 @@ def bzr_version_summary(path):
 
 def git_version_summary(path, env=None):
     # Get version from GIT
+    if not 'GIT' in env and os.path.exists("/usr/bin/git"):
+        # this is useful when doing make dist without configuring
+        env.GIT = "/usr/bin/git"
+
     if not 'GIT' in env:
         return ("GIT-UNKNOWN", {})
 
@@ -74,7 +78,7 @@ def git_version_summary(path, env=None):
     ret = "GIT-" + fields["GIT_COMMIT_ABBREV"]
 
     if env.GIT_LOCAL_CHANGES:
-        clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True).strip()
+        clean = Utils.cmd_output('%s diff HEAD | wc -l' % env.GIT, silent=True).strip()
         if clean == "0":
             fields["COMMIT_IS_CLEAN"] = 1
         else:
diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 0408d61..0d0af79 100644
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -453,9 +453,14 @@ def symbols_dupcheck(task):
 
     Logs.info("Checking for duplicate symbols")
     for sym in bld.env.symbol_map:
-        subsystems = bld.env.symbol_map[sym]
+        subsystems = set(bld.env.symbol_map[sym])
         if len(subsystems) == 1:
             continue
+
+        if sym in ['main', '_init', '_fini', 'init_samba_module', 'samba_init_module', 'ldb_init_module' ]:
+            # these are expected to be in many subsystems
+            continue
+
         # if all of them are in system libraries, we can ignore them. This copes
         # with the duplication between libc, libpthread and libattr
         all_syslib = True


-- 
Samba Shared Repository