summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2014-05-25 11:31:44 +1000
committerMichael Adam <obnox@samba.org>2014-06-20 23:38:09 +0200
commit4a5ded2b69b7538688da59423bd1b53df1d6c77a (patch)
treeb77865ac999a1366cdcd5babd0a4b0ef9e40ea79
parentcd7f401744e1fa65d309c7c9b8e68eb7c6faf2bc (diff)
downloadsamba-4a5ded2b69b7538688da59423bd1b53df1d6c77a.tar.gz
wafsamba: allow samba_dist.dist() to be called from a different directory.
Up to now it assumed to be called from the top level srcdir. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--buildtools/wafsamba/samba_dist.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index fae2759dac0..4d082fe62ae 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -128,10 +128,13 @@ def dist(appname='', version=''):
def list_directory_files(abspath):
+ curdir = os.getcwd()
+ os.chdir(srcdir)
out_files = []
for root, dirs, files in os.walk(abspath):
for f in files:
out_files.append(os.path.join(root, f))
+ os.chdir(curdir)
return out_files