summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-06 20:11:01 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-06 11:13:05 +0000
commitc24240bcd2f833321f45ea4ce0b6c6d080a3b990 (patch)
tree0075709dd705752b56ee242bd01a72092c6a22c9 /source4
parent8fcccae6aa4f48e7ef03fbf8e5b5f24ea0209d2e (diff)
downloadsamba-c24240bcd2f833321f45ea4ce0b6c6d080a3b990.tar.gz
samba-c24240bcd2f833321f45ea4ce0b6c6d080a3b990.tar.bz2
samba-c24240bcd2f833321f45ea4ce0b6c6d080a3b990.zip
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?
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/wscript_build7
-rw-r--r--source4/setup/wscript_build4
2 files changed, 7 insertions, 4 deletions
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')