diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-19 16:00:04 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-19 16:00:04 +0200 |
| commit | 24930aa716c3501b336e8f5534590e968d837aaf (patch) | |
| tree | 367b7611582763bdb27c0b1f7c50c2242129d79e | |
| parent | b099631f428d0ecc641d59bd3c94674e6348dde9 (diff) | |
| download | samba-24930aa716c3501b336e8f5534590e968d837aaf.tar.gz samba-24930aa716c3501b336e8f5534590e968d837aaf.tar.bz2 samba-24930aa716c3501b336e8f5534590e968d837aaf.zip | |
wafsamba: Use octal modes directly rather than constants.
| -rw-r--r-- | buildtools/wafsamba/samba_install.py | 4 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 41722098bc..488729bc51 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -7,8 +7,6 @@ import Options from TaskGen import feature, before, after from samba_utils import * -O755 = 493 - @feature('install_bin') @after('apply_core') @before('apply_link', 'apply_obj_vars') @@ -43,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=O755) + chmod=0755) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index e45544589c..a1718d33ba 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -29,8 +29,6 @@ import generic_cc import samba_dist import samba_wildcard -O644 = 420 - # some systems have broken threading in python if os.environ.get('WAF_NOTHREADS') == '1': import nothreads @@ -594,7 +592,7 @@ def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None): Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT -def install_file(bld, destdir, file, chmod=O644, flat=False, +def install_file(bld, destdir, file, chmod=0644, flat=False, python_fixup=False, destname=None, base_name=None): '''install a file''' destdir = bld.EXPAND_VARIABLES(destdir) @@ -616,7 +614,7 @@ def install_file(bld, destdir, file, chmod=O644, flat=False, bld.install_as(dest, file, chmod=chmod) -def INSTALL_FILES(bld, destdir, files, chmod=O644, flat=False, +def INSTALL_FILES(bld, destdir, files, chmod=0644, flat=False, python_fixup=False, destname=None, base_name=None): '''install a set of files''' for f in TO_LIST(files): @@ -626,7 +624,7 @@ def INSTALL_FILES(bld, destdir, files, chmod=O644, flat=False, Build.BuildContext.INSTALL_FILES = INSTALL_FILES -def INSTALL_WILDCARD(bld, destdir, pattern, chmod=O644, flat=False, +def INSTALL_WILDCARD(bld, destdir, pattern, chmod=0644, 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)) |