samba.git/ctdb, branch talloc-2.2.0

build: Standardise on calling conf.SAMBA_CHECK_PYTHON() in libraries

2019-03-21T04:06:16+00:00

We do this by removing the confusing mandatory option to
conf.SAMBA_CHECK_PYTHON{,_HEADERS}(), instead just use the value of
--disable-python internally

This follows the default minimum of Python 3.4 and keeps things consistent
with the main Samba build where --disable-python is required to skip building
python bindings.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Douglas Bagnall

build: Remove manual specification of minimum python version

2019-03-21T04:06:16+00:00

We now used the default of 3.4 from conf.SAMBA_CHECK_PYTHON()

Signed-off-by: Andrew Bartlett 
Reviewed-by: Douglas Bagnall

ctdb-version: Simplify version string usage

2019-03-15T06:31:50+00:00

There is no need to write SAMBA_VERSION_STRING as CTDB_VERSION_STRING.
Wherever required use SAMBA_VERSION_STRING directly.

Avoids the confusion with two version.h files.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13789

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Fri Mar 15 06:31:50 UTC 2019 on sn-devel-144

ctdb-build: Drop creation of .distversion in tarball

2019-03-15T05:17:14+00:00

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13789

Signed-off-by: Amitay Isaacs 
Reviewed-by: Martin Schwenke

ctdb-build: use a fixed ctdb_version.h using SAMBA_VERSION_STRING

2019-03-15T05:17:14+00:00

This way we don't get constant rebuild as SAMBA_VERSION_STRING
is "4.7.0pre1.DEVELOPERBUILD" for the binaries under bin/
instead of "4.7.0pre1.GIT.59e51f6".

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13789

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Martin Schwenke

ctdb-tests: Add a test for version consistency checking

2019-03-15T05:17:14+00:00

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs

ctdb-daemon: Add an environment variable to set version

2019-03-15T05:17:14+00:00

This can be used to test the version checking logic.  Cache the
version to avoid re-checking the environment variable each time.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs

ctdb-tests: Fix remaining common.sh ShellCheck hits

2019-03-15T05:17:14+00:00

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs

ctdb-tests: Shell cleanups in wait_until() function

2019-03-15T05:17:14+00:00

This file is included by local_daemons.sh, which is not a bash script
and wait_until() uses the "local" keyword.  Prefixing variable names
with '_' to indicate that they are local changes a lot of lines in
this function.  So, fix indentation, potential quoting problems and
other ShellCheck hits while touching this function.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs

ctdb-tests: export CTDB_SCRIPTS_TOOLS_BIN_DIR

2019-03-15T05:17:14+00:00

This isn't used anywhere that requires it to be exported, but the lack
of consistency will cause problems and confusion at some later stage.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs