summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-07 15:03:26 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-07 05:49:58 +0100
commit4d3de16b8b9e69408582ea9aa995b44b7a1e83f4 (patch)
tree4c85d1724ca30f95c989c4c3e9d32787801a45cd /buildtools
parent2e520ca91180920e4c8b71be4eaa7fabb56d2a12 (diff)
downloadsamba-4d3de16b8b9e69408582ea9aa995b44b7a1e83f4.tar.gz
samba-4d3de16b8b9e69408582ea9aa995b44b7a1e83f4.tar.bz2
samba-4d3de16b8b9e69408582ea9aa995b44b7a1e83f4.zip
s4-build: fixed uses of os.path.relpath()
these should be os_path_relpath() to support older python versions. This should fix the build on FreeBSD 7.2 Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Mon Feb 7 05:49:58 CET 2011 on sn-devel-104
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_dist.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index d2be291703..a11a37cc1b 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -80,14 +80,14 @@ def vcs_dir_contents(path):
while repo != "/":
if os.path.isdir(os.path.join(repo, ".git")):
ls_files_cmd = [ 'git', 'ls-files', '--full-name',
- os.path.relpath(path, repo) ]
+ os_path_relpath(path, repo) ]
cwd = None
env = dict(os.environ)
env["GIT_DIR"] = os.path.join(repo, ".git")
break
elif os.path.isdir(os.path.join(repo, ".bzr")):
ls_files_cmd = [ 'bzr', 'ls', '--recursive', '--versioned',
- os.path.relpath(path, repo)]
+ os_path_relpath(path, repo)]
cwd = repo
env = None
break