summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-03-20 19:32:33 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-03-20 20:21:28 +0100
commitbc4ab2412698e8ab8f3d316380448df3eb28c5f7 (patch)
treebe2b781dd812ad56e759e5957f71a3fa99f3bbe5 /dev-python/pymysql
parentapp-admin/hcloud: version bump to 1.21.1 - remove old (diff)
downloadgentoo-bc4ab2412698e8ab8f3d316380448df3eb28c5f7.tar.gz
gentoo-bc4ab2412698e8ab8f3d316380448df3eb28c5f7.tar.bz2
gentoo-bc4ab2412698e8ab8f3d316380448df3eb28c5f7.zip
dev-python/pymysql: adjust mysql_install_db location
Since commit 755be857e3051, mysql_install_db location has changed. While here, make sure mysqld from $EPREFIX is used, too. Reported-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'dev-python/pymysql')
-rw-r--r--dev-python/pymysql/pymysql-1.0.2.ebuild13
1 files changed, 10 insertions, 3 deletions
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index dbbedb942643..c2dda33e27a7 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -41,6 +41,13 @@ src_test() {
einfo "USER set to '${USER}'"
fi
+ local mysql_install_db_cmd="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db"
+ [[ ! -x "${mysql_install_db_cmd}" ]] && mysql_install_db_cmd="${EPREFIX}/usr/bin/mysql_install_db"
+ [[ ! -x "${mysql_install_db_cmd}" ]] && die "mysql_install_db command not found!"
+
+ local mysqld_cmd="${EPREFIX}/usr/sbin/mysqld"
+ [[ ! -x "${mysqld_cmd}" ]] && die "mysqld command not found!"
+
local PIDFILE="${T}/mysqld.pid"
if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
einfo "Killing already running mysqld process ..."
@@ -54,16 +61,16 @@ src_test() {
einfo "Creating mysql test instance ..."
mkdir -p "${T}"/mysql || die
- "${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+ "${mysql_install_db_cmd}" \
--no-defaults \
--auth-root-authentication-method=normal \
- --basedir="${BROOT}/usr" \
+ --basedir="${EPREFIX}/usr" \
--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
|| die
einfo "Starting mysql test instance ..."
# TODO: random port
- mysqld \
+ "${mysqld_cmd}" \
--no-defaults \
--character-set-server=utf8 \
--bind-address=127.0.0.1 \