diff options
| author | Sam James <sam@gentoo.org> | 2025-01-09 07:56:58 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-01-09 07:57:36 +0000 |
| commit | 227eaf7997e974de7ff0886d6a2762ec3f16a347 (patch) | |
| tree | a8f494625388eb12e71fe77db40b9848a61b1856 /dev-db | |
| parent | 8a5cd4af5216a5189e2405850a7213c5f20de6d1 (diff) | |
| download | gentoo-227eaf7997e974de7ff0886d6a2762ec3f16a347.tar.gz gentoo-227eaf7997e974de7ff0886d6a2762ec3f16a347.tar.bz2 gentoo-227eaf7997e974de7ff0886d6a2762ec3f16a347.zip | |
Revert "dev-db/mariadb-connector-c: pass --no-defaults to mysqladmin too"
This reverts commit 506481663946acf3d4522593975a763cdaf0f5e0.
This doesn't work. Serves me right for a speculative fix.
Bug: https://bugs.gentoo.org/942287
Closes: https://bugs.gentoo.org/947756
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild | 2 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild index fdf4b945fa06..eb4f7ef8cec1 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild @@ -109,7 +109,7 @@ multilib_src_test() { mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & local attempts=0 - while ! mysqladmin ping --no-defaults --socket="${T}/mysql/mysql.sock" --silent ; do + while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do # 5 minutes should be more than enough if [[ ${attempts} -gt 300 ]] ; then die "mysqld not found after 300 seconds, aborting" diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild index 16f992e304e8..45553edc1b5e 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,15 +108,8 @@ multilib_src_test() { mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & - local attempts=0 - while ! mysqladmin ping --no-defaults --socket="${T}/mysql/mysql.sock" --silent ; do - # 5 minutes should be more than enough - if [[ ${attempts} -gt 300 ]] ; then - die "mysqld not found after 300 seconds, aborting" - fi - + while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 - attempts=$((attempts + 1)) done cd unittest/libmariadb || die |