The branch, master has been updated
via 6e6436a ctdb-build: Don't try to install unavailable prebuilt
manpages
via 85a2a2c ctdb-tests: Try to connect few times before failing in
comm_client_test
from 42d5b06 vfs: Remove smb_traffic_analyzer
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6e6436a2f050dd204218868e673a3396ad758ad1
Author: Martin Schwenke <[email protected]>
Date: Tue Nov 10 10:14:56 2015 +1100
ctdb-build: Don't try to install unavailable prebuilt manpages
Commit 3ddd35142ab86de431d00f93de2fb6a2b371317d tries to
unconditionally install pre-built manpages if xsltproc is unavailable.
However, these only exist in a tarball, not in a git repo. That can
make the installation fail.
If xsltproc does not exist then check for each pre-built manpage at
configure time. This should cover all the possible cases.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Wed Nov 11 06:23:48 CET 2015 on sn-devel-104
commit 85a2a2c9119d75b7bd502c46d1fec85d5f7ba943
Author: Amitay Isaacs <[email protected]>
Date: Tue Nov 10 14:49:30 2015 +1100
ctdb-tests: Try to connect few times before failing in comm_client_test
cunit/comm_test_002.sh requires that the comm_server_test is started
before comm_client_test. Since comm_server_test is started in background,
it's possible for comm_client_test to run before comm_server_test has
bound to the unix domain socket.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/tests/src/comm_client_test.c | 10 ++++++++--
ctdb/wscript | 17 +++++++++++++++--
2 files changed, 23 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tests/src/comm_client_test.c
b/ctdb/tests/src/comm_client_test.c
index e1ebe1c..8db219e 100644
--- a/ctdb/tests/src/comm_client_test.c
+++ b/ctdb/tests/src/comm_client_test.c
@@ -156,7 +156,7 @@ static void writer_recv(struct tevent_req *req, int *perr)
static int socket_init(char *sockpath)
{
struct sockaddr_un addr;
- int fd, ret;
+ int fd, ret, i;
size_t len;
memset(&addr, 0, sizeof(addr));
@@ -168,7 +168,13 @@ static int socket_init(char *sockpath)
fd = socket(AF_UNIX, SOCK_STREAM, 0);
assert(fd != -1);
- ret = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
+ for (i=0; i<5; i++) {
+ ret = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
+ if (ret == 0) {
+ break;
+ }
+ sleep(1);
+ }
assert(ret != -1);
return fd;
diff --git a/ctdb/wscript b/ctdb/wscript
index b720748..cea9e42 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -227,6 +227,19 @@ def configure(conf):
conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
conf.SAMBA_CONFIG_H()
+ if 'XSLTPROC_MANPAGES' in conf.env and conf.env['XSLTPROC_MANPAGES']:
+ conf.env.ctdb_generate_manpages = True
+ else:
+ conf.env.ctdb_generate_manpages = False
+
+ Logs.info("xsltproc unavailable, checking for pre-built manpages")
+ conf.env.ctdb_prebuilt_manpages = []
+ for m in manpages:
+ if os.path.exists(os.path.join("doc", m)):
+ Logs.info(" %s: yes" % (m))
+ conf.env.ctdb_prebuilt_manpages.append(m)
+ else:
+ Logs.info(" %s: no" % (m))
def build(bld):
if bld.env.standalone_ctdb:
@@ -493,12 +506,12 @@ def build(bld):
target=x,
rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
- if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ if bld.env.ctdb_generate_manpages:
bld.MANPAGES('''onnode.1 ctdbd_wrapper.1 ctdbd.conf.5
ctdb.7 ctdb-statistics.7 ctdb-tunables.7''',
True)
else:
- for m in manpages:
+ for m in bld.env.ctdb_prebuilt_manpages:
bld.SAMBA_GENERATOR(m,
source=os.path.join("doc", m),
target=m,
--
Samba Shared Repository
