From c24240bcd2f833321f45ea4ce0b6c6d080a3b990 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 6 Oct 2010 20:11:01 +1100 Subject: 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? --- source4/scripting/wscript_build | 7 ++++--- source4/setup/wscript_build | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'source4') diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build index 8d1b168135..76ff739c9e 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 f337e6f526..241e8b8686 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') -- cgit