Small fixes
Add new requirement for pv tool for debian and rpm Fix one test result difference. Set message about missing progress reporting tool pv as info.
This commit is contained in:
parent
73d80c8672
commit
7878eae95e
@ -226,6 +226,7 @@ IF(WITH_WSREP)
|
||||
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
|
||||
"galera-4" "rsync" "lsof" "grep" "gawk" "iproute"
|
||||
"coreutils" "findutils" "tar")
|
||||
SETA(CPACK_RPM_server_PACKAGE_RECOMMENDS "pv")
|
||||
ENDIF()
|
||||
|
||||
SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
|
||||
|
3
debian/control
vendored
3
debian/control
vendored
@ -658,7 +658,8 @@ Architecture: any
|
||||
Suggests: mailx,
|
||||
mariadb-test,
|
||||
netcat-openbsd
|
||||
Recommends: libhtml-template-perl
|
||||
Recommends: libhtml-template-perl,
|
||||
pv
|
||||
Pre-Depends: adduser (>= 3.40),
|
||||
debconf,
|
||||
mariadb-common (>= ${source:Version})
|
||||
|
@ -457,8 +457,8 @@ get_footprint()
|
||||
adjust_progress()
|
||||
{
|
||||
if [ -z "$(commandex pv)" ]; then
|
||||
wsrep_log_error "pv not found in path: $PATH"
|
||||
wsrep_log_error "Disabling all progress/rate-limiting"
|
||||
wsrep_log_info "Progress reporting tool pv not found in path: $PATH"
|
||||
wsrep_log_info "Disabling all progress/rate-limiting"
|
||||
pcmd=""
|
||||
rlimit=""
|
||||
progress=""
|
||||
|
Loading…
x
Reference in New Issue
Block a user