The branch, master has been updated
via 3bd68261eca ctdb-eventscripts: Remove non-posix -v option to mkdir
via 4a7fc97daff ctdb-eventscripts: Fix the regression in
01.reclock.script
from 1006f7abe89 docs: Deprecate "lanman auth = yes"
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3bd68261eca398895c419284db6515fd6f393f0f
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Jul 31 12:13:52 2019 +1000
ctdb-eventscripts: Remove non-posix -v option to mkdir
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Fri Sep 6 11:11:02 UTC 2019 on sn-devel-184
commit 4a7fc97daff69b8cba9c4e2da6a8e1399d6b1107
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Jul 31 12:12:14 2019 +1000
ctdb-eventscripts: Fix the regression in 01.reclock.script
Commit ea7708d8c7fa674111ccea58b3cd0757765c702a simplified
01.reclock.script and removed include of functions file which is
required for setting CTDB_HELPER_BINDIR and for die() function.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events/legacy/01.reclock.script | 4 +++-
ctdb/tests/eventscripts/01.reclock.init.003.sh | 12 +-----------
2 files changed, 4 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events/legacy/01.reclock.script
b/ctdb/config/events/legacy/01.reclock.script
index 29822e1d48c..ab0f2f6a32b 100755
--- a/ctdb/config/events/legacy/01.reclock.script
+++ b/ctdb/config/events/legacy/01.reclock.script
@@ -4,6 +4,8 @@
[ -n "$CTDB_BASE" ] || \
CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD")
+. "${CTDB_BASE}/functions"
+
case "$1" in
init)
recovery_lock=$("${CTDB_HELPER_BINDIR}/ctdb-config" \
@@ -27,6 +29,6 @@ init)
esac
d=$(dirname "$recovery_lock")
- mkdir -vp "$d"
+ mkdir -p "$d"
;;
esac
diff --git a/ctdb/tests/eventscripts/01.reclock.init.003.sh
b/ctdb/tests/eventscripts/01.reclock.init.003.sh
index 85f1f3c6f80..a8b6abdf5b5 100755
--- a/ctdb/tests/eventscripts/01.reclock.init.003.sh
+++ b/ctdb/tests/eventscripts/01.reclock.init.003.sh
@@ -12,17 +12,7 @@ dir=$(dirname "$CTDB_RECOVERY_LOCK")
required_result 1 ""
unit_test test -d "$dir"
-# FreeBSD mkdir -v just prints the filename. Filter the rest of the
-# message from other platforms, including any exotic quotes around the
-# filename.
-result_filter ()
-{
- sed \
- -e 's|^\(mkdir: created directory \)[[:punct:]]||' \
- -e 's|[[:punct:]]$||'
-}
-
-ok "$dir"
+ok_null
simple_test
# Ensure directory exists after
--
Samba Shared Repository
