path: root/buildtools/wafsamba
diff options
authorMartin Schwenke <martin@meltin.net>2017-08-06 14:56:17 +1000
committerAmitay Isaacs <amitay@samba.org>2017-08-10 06:43:13 +0200
commit68a02d18c135a30adf0f67ec370d5e2db5ea136e (patch)
treeb549a0b212dc304f8b8c491bbdb645f076ee023f /buildtools/wafsamba
parentd7e60bc17e1f5428e5459e6d60a7c8b1f146a3aa (diff)
build: Do not ignore symlinks to directories when building tarballs
Tarballs currently do not contain symbolic links to directories even if they are committed in git. This means that CTDB tests fail when run in-tree from a tarball, due to a couple of missing links needed by unit tests: ERROR: Directory .../ctdb/tests/var/unit_eventscripts/etc-ctdb/events.d does not exist. Subdirectories of directories specified via DIST_DIRS() are ignored, since all the files within them are separately added to the tarball. Symbolic links to directories are detected as directories, so they are also ignored, causing them to be missing from the tarball. Instead, do not treat symbolic links to directories as directories, but add them to the tarball like normal files. It is easy to confirm that this change causes no difference to current tarballs other than causing the missing CTDB test links to be added: $ diff -u samba-4.8.0pre1-GIT-eb691cd0242.tar.gz.contents samba-4.8.0pre1-GIT-dfb16de0149.tar.gz.contents --- samba-4.8.0pre1-GIT-eb691cd0242.tar.gz.contents 2017-08-08 20:21:40.022993091 +1000 +++ samba-4.8.0pre1-GIT-dfb16de0149.tar.gz.contents 2017-08-08 20:35:11.001580747 +1000 @@ -578,7 +578,9 @@ ctdb/tests/eventscripts/91.lvs.startup.001.sh ctdb/tests/eventscripts/91.lvs.startup.002.sh ctdb/tests/eventscripts/README +ctdb/tests/eventscripts/etc-ctdb/events.d ctdb/tests/eventscripts/etc-ctdb/functions +ctdb/tests/eventscripts/etc-ctdb/nfs-checks.d ctdb/tests/eventscripts/etc-ctdb/nfs-linux-kernel-callout ctdb/tests/eventscripts/etc-ctdb/public_addresses ctdb/tests/eventscripts/etc-ctdb/rc.local Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'buildtools/wafsamba')
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index dbcb02a74d7..4dacba23d2e 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -115,7 +115,7 @@ def dist(appname='', version=''):
blacklisted = True
if blacklisted:
- if os.path.isdir(abspath):
+ if os.path.isdir(abspath) and not os.path.islink(abspath):
if dstsubdir != '.':
f = dstsubdir + '/' + f