[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  8dcd4cc wafsamba: Override GIT_DIR without using putenv.
       via  ceb1e17 talloc: Bump version number after pytalloc changes.
      from  2b0ff09 Replace lseek()/write()/lseek() triple with pwrite call. We already emulate this inside pwrite under the covers.

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


- Log -----------------------------------------------------------------
commit 8dcd4cca4eb81eb41fab8da7bb5f32c3a3de8b55
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Dec 3 03:10:27 2010 +0100

    wafsamba: Override GIT_DIR without using putenv.
    
    putenv has sideffects on later code. This overrides GIT_DIR for just this call.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Fri Dec  3 04:24:53 CET 2010 on sn-devel-104

commit ceb1e176aa7c067e31ad596a11f67ae94a992876
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Dec 3 03:07:03 2010 +0100

    talloc: Bump version number after pytalloc changes.

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

Summary of changes:
 buildtools/wafsamba/samba_version.py |    7 ++++---
 lib/talloc/wscript                   |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 076615b..4f99b2c 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -49,9 +49,10 @@ def git_version_summary(path, env=None):
     if not 'GIT' in env:
         return ("GIT-UNKNOWN", {})
 
-    os.putenv('GIT_DIR', '%s/.git' % path)
-    os.putenv('GIT_WORK_TREE', path)
-    git = Utils.cmd_output(env.GIT + ' show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD', silent=True)
+    environ = dict(os.environ)
+    environ["GIT_DIR"] = '%s/.git' % path
+    environ["GIT_WORK_TREE"] = path
+    git = Utils.cmd_output(env.GIT + ' show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD', silent=True, env=environ)
 
     lines = git.splitlines()
     if not lines or len(lines) < 4:
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 264c345..9d7fcc2 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 APPNAME = 'talloc'
-VERSION = '2.0.3'
+VERSION = '2.0.4'
 
 
 blddir = 'bin'


-- 
Samba Shared Repository