[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  35206df build: move the import near the place where need it, so that we can build on hosts with python's zlib
      from  4c373d2 s4:scripting/python/pyglue.c - add a OOM handling

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


- Log -----------------------------------------------------------------
commit 35206df51af8288bedc3efb5e8bdd44feff42af6
Author: Matthieu Patou <mat at matws.net>
Date:   Sun Dec 12 23:57:37 2010 +0300

    build: move the import near the place where need it, so that we can build on hosts with python's zlib
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sun Dec 12 22:54:19 CET 2010 on sn-devel-104

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

Summary of changes:
 buildtools/wafsamba/samba_dist.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 1b27806..d2be291 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -1,7 +1,7 @@
 # customised version of 'waf dist' for Samba tools
 # uses git ls-files to get file lists
 
-import Utils, os, sys, tarfile, gzip, stat, Scripting, Logs, Options
+import Utils, os, sys, tarfile, stat, Scripting, Logs, Options
 from samba_utils import *
 
 dist_dirs = None
@@ -160,6 +160,7 @@ def dist(appname='',version=''):
     tar.close()
 
     if Options.options.SIGN_RELEASE:
+        import gzip
         try:
             os.unlink(dist_name + '.asc')
         except OSError:


-- 
Samba Shared Repository