mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
mysql-{cmake,multilib-r1}.eclass: Remove duplicated management of runtime directories
Closes: https://bugs.gentoo.org/show_bug.cgi?id=632694
This commit is contained in:
@@ -501,27 +501,6 @@ mysql-cmake_src_install() {
|
||||
eprefixify "${TMPDIR}/my.cnf.ok"
|
||||
newins "${TMPDIR}/my.cnf.ok" my.cnf
|
||||
|
||||
# Minimal builds don't have the MySQL server
|
||||
if use_if_iuse minimal ; then
|
||||
:
|
||||
elif ! in_iuse server || use_if_iuse server ; then
|
||||
einfo "Creating initial directories"
|
||||
# Empty directories ...
|
||||
diropts "-m0750"
|
||||
if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
|
||||
dodir "${MY_DATADIR#${EPREFIX}}"
|
||||
keepdir "${MY_DATADIR#${EPREFIX}}"
|
||||
nonfatal fowners -R mysql:mysql "${D}/${MY_DATADIR}"
|
||||
fi
|
||||
|
||||
diropts "-m0755"
|
||||
for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
|
||||
dodir "${folder}"
|
||||
keepdir "${folder}"
|
||||
nonfatal fowners -R mysql:mysql "${ED}/${folder}"
|
||||
done
|
||||
fi
|
||||
|
||||
# Minimal builds don't have the MySQL server
|
||||
if use_if_iuse minimal ; then
|
||||
:
|
||||
|
||||
@@ -598,22 +598,6 @@ multilib_src_install() {
|
||||
newins "${TMPDIR}/my.cnf.ok" my.cnf
|
||||
|
||||
if use server ; then
|
||||
einfo "Creating initial directories"
|
||||
# Empty directories ...
|
||||
diropts "-m0750"
|
||||
if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then
|
||||
dodir "${MY_DATADIR#${EPREFIX}}"
|
||||
keepdir "${MY_DATADIR#${EPREFIX}}"
|
||||
nonfatal fowners -R mysql:mysql "${D}/${MY_DATADIR}"
|
||||
fi
|
||||
|
||||
diropts "-m0755"
|
||||
for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
|
||||
dodir "${folder}"
|
||||
keepdir "${folder}"
|
||||
nonfatal fowners -R mysql:mysql "${ED}/${folder}"
|
||||
done
|
||||
|
||||
einfo "Including support files and sample configurations"
|
||||
docinto "support-files"
|
||||
for script in \
|
||||
|
||||
Reference in New Issue
Block a user