[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Wed Oct 6 05:55:01 MDT 2010
The branch, master has been updated
via 8a56f8d s3-spoolss: added another intermittent failure to knownfail
via 1e2c1c8 autobuild: only add autobuild.log if it exists
via c24240b waf: fixed some python3.x portability issues
via 8fcccae waf: update to waf version 1.5.19
from 8e5f8d7 s4:samldb LDB module - remove "type" parameter of "samldb_fill_object"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8a56f8ddb141ea32f6efe182ba97b822b1b200a5
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Oct 6 22:06:46 2010 +1100
s3-spoolss: added another intermittent failure to knownfail
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Wed Oct 6 11:55:00 UTC 2010 on sn-devel-104
commit 1e2c1c89427c8230acb12a755d44d6b46b05a906
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Oct 6 20:15:48 2010 +1100
autobuild: only add autobuild.log if it exists
this makes running autobuild on other than sn-devel easier
commit c24240bcd2f833321f45ea4ce0b6c6d080a3b990
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Oct 6 20:11:01 2010 +1100
waf: fixed some python3.x portability issues
these have crept into the tree over time. Maybe we should add testing
of a range of python versions to autobuild?
commit 8fcccae6aa4f48e7ef03fbf8e5b5f24ea0209d2e
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Oct 6 18:55:38 2010 +1100
waf: update to waf version 1.5.19
this includes a number of perforance improvements and bug
fixes. Thanks to Thomas for all the recent improvements!
-----------------------------------------------------------------------
Summary of changes:
buildtools/bin/waf-svn | Bin 107944 -> 109173 bytes
buildtools/wafsamba/samba_install.py | 2 +-
buildtools/wafsamba/samba_utils.py | 4 ++++
buildtools/wafsamba/samba_version.py | 2 +-
buildtools/wafsamba/wafsamba.py | 8 ++++----
pidl/wscript | 3 ++-
script/autobuild.py | 3 ++-
source3/selftest/knownfail | 1 +
source4/scripting/wscript_build | 7 ++++---
source4/setup/wscript_build | 4 +++-
10 files changed, 22 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/bin/waf-svn b/buildtools/bin/waf-svn
index 64c653c..7dc8507 100755
Binary files a/buildtools/bin/waf-svn and b/buildtools/bin/waf-svn differ
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 05ea56c..dda44cd 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -41,7 +41,7 @@ def install_binary(self):
# tell waf to install the right binary
bld.install_as(os.path.join(install_path, orig_target),
os.path.join(self.path.abspath(bld.env), self.target),
- chmod=0755)
+ chmod=MODE_755)
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index d466cfa..7ce9f75 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -11,6 +11,10 @@ import shlex
LIB_PATH="shared"
+# sigh, python octal constants are a mess
+MODE_644 = int('644', 8)
+MODE_755 = int('755', 8)
+
@conf
def SET_TARGET_TYPE(ctx, target, value):
'''set the target type of a target'''
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 82f882f..735a700 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -173,7 +173,7 @@ class samba_version_file(samba_version):
value = split_line[1].strip('"')
version_dict[split_line[0]] = value
except:
- print "Failed to parse line %s from %s" % (line, version_file)
+ print("Failed to parse line %s from %s" % (line, version_file))
raise
super(samba_version_file, self).__init__(version_dict, have_git=have_git)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 3da1e14..262d3bd 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -36,7 +36,7 @@ LIB_PATH="shared"
os.putenv('PYTHONUNBUFFERED', '1')
-if Constants.HEXVERSION < 0x105016:
+if Constants.HEXVERSION < 0x105019:
Logs.error('''
Please use the version of waf that comes with Samba, not
a system installed version. See http://wiki.samba.org/index.php/Waf
@@ -573,7 +573,7 @@ def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None):
Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
-def install_file(bld, destdir, file, chmod=0644, flat=False,
+def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
python_fixup=False, destname=None, base_name=None):
'''install a file'''
destdir = bld.EXPAND_VARIABLES(destdir)
@@ -601,7 +601,7 @@ def install_file(bld, destdir, file, chmod=0644, flat=False,
bld.install_as(dest, file, chmod=chmod)
-def INSTALL_FILES(bld, destdir, files, chmod=0644, flat=False,
+def INSTALL_FILES(bld, destdir, files, chmod=MODE_644, flat=False,
python_fixup=False, destname=None, base_name=None):
'''install a set of files'''
for f in TO_LIST(files):
@@ -611,7 +611,7 @@ def INSTALL_FILES(bld, destdir, files, chmod=0644, flat=False,
Build.BuildContext.INSTALL_FILES = INSTALL_FILES
-def INSTALL_WILDCARD(bld, destdir, pattern, chmod=0644, flat=False,
+def INSTALL_WILDCARD(bld, destdir, pattern, chmod=MODE_644, flat=False,
python_fixup=False, exclude=None, trim_path=None):
'''install a set of files matching a wildcard pattern'''
files=TO_LIST(bld.path.ant_glob(pattern))
diff --git a/pidl/wscript b/pidl/wscript
index f2b65c8..8cb0c6f 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import os
+from samba_utils import MODE_755
def set_options(opt):
opt.tool_options('perl')
@@ -18,7 +19,7 @@ def configure(conf):
conf.find_program('pod2man', var='POD2MAN')
def build(bld):
- bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=0755)
+ bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755)
bld.RECURSE('lib')
diff --git a/script/autobuild.py b/script/autobuild.py
index b639c60..fe0c1e2 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -215,7 +215,8 @@ class buildlist(object):
for b in self.tlist:
tar.add(b.stdout_path, arcname="%s.stdout" % b.tag)
tar.add(b.stderr_path, arcname="%s.stderr" % b.tag)
- tar.add("autobuild.log")
+ if os.path.exists("autobuild.log"):
+ tar.add("autobuild.log")
tar.close()
def remove_logs(self):
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index 49e758e..c00d031 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -2,3 +2,4 @@
.*printer.*print_test # fails on some hosts due to timing issues ?
samba3.posix_s3.rap.printing # fails sometimes on sn-devel
samba3.posix_s3.rpc.spoolss.*PRINTSERVER.enum_printers_old
+samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 8d1b168..76ff739 100644
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -1,7 +1,8 @@
#!/usr/bin/env python
+from samba_utils import MODE_755
+
bld.INSTALL_FILES('${SBINDIR}','bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate',
- chmod=0755, python_fixup=True, flat=True)
+ chmod=MODE_755, python_fixup=True, flat=True)
bld.INSTALL_FILES('${BINDIR}','bin/testparm',
- chmod=0755, python_fixup=True, flat=True)
-
+ chmod=MODE_755, python_fixup=True, flat=True)
diff --git a/source4/setup/wscript_build b/source4/setup/wscript_build
index f337e6f..241e8b8 100644
--- a/source4/setup/wscript_build
+++ b/source4/setup/wscript_build
@@ -1,9 +1,11 @@
#!/usr/bin/env python
+from samba_utils import MODE_755
+
bld.INSTALL_WILDCARD('${SETUPDIR}', 'ad-schema/*.txt')
bld.INSTALL_WILDCARD('${SETUPDIR}', 'display-specifiers/*.txt')
-bld.INSTALL_FILES('${SBINDIR}', 'provision', chmod=0755, python_fixup=True)
+bld.INSTALL_FILES('${SBINDIR}', 'provision', chmod=MODE_755, python_fixup=True)
bld.INSTALL_FILES('${SETUPDIR}', 'dns_update_list')
bld.INSTALL_FILES('${SETUPDIR}', 'spn_update_list')
--
Samba Shared Repository
More information about the samba-cvs
mailing list