| 1 |
commit: bc4b6477a76cbf6a0db03a3fb7582bba49fa581c |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 2 17:12:17 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 2 17:13:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4b6477 |
| 7 |
|
| 8 |
mysql-{cmake,multilib-r1}.eclass: Remove duplicated management of runtime directories |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=632694 |
| 11 |
|
| 12 |
eclass/mysql-cmake.eclass | 21 --------------------- |
| 13 |
eclass/mysql-multilib-r1.eclass | 16 ---------------- |
| 14 |
2 files changed, 37 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 17 |
index 2963a97ada8..cd9e9fe294f 100644 |
| 18 |
--- a/eclass/mysql-cmake.eclass |
| 19 |
+++ b/eclass/mysql-cmake.eclass |
| 20 |
@@ -504,27 +504,6 @@ mysql-cmake_src_install() { |
| 21 |
# Minimal builds don't have the MySQL server |
| 22 |
if use_if_iuse minimal ; then |
| 23 |
: |
| 24 |
- elif ! in_iuse server || use_if_iuse server ; then |
| 25 |
- einfo "Creating initial directories" |
| 26 |
- # Empty directories ... |
| 27 |
- diropts "-m0750" |
| 28 |
- if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then |
| 29 |
- dodir "${MY_DATADIR#${EPREFIX}}" |
| 30 |
- keepdir "${MY_DATADIR#${EPREFIX}}" |
| 31 |
- nonfatal fowners -R mysql:mysql "${D}/${MY_DATADIR}" |
| 32 |
- fi |
| 33 |
- |
| 34 |
- diropts "-m0755" |
| 35 |
- for folder in "${MY_LOGDIR#${EPREFIX}}" ; do |
| 36 |
- dodir "${folder}" |
| 37 |
- keepdir "${folder}" |
| 38 |
- nonfatal fowners -R mysql:mysql "${ED}/${folder}" |
| 39 |
- done |
| 40 |
- fi |
| 41 |
- |
| 42 |
- # Minimal builds don't have the MySQL server |
| 43 |
- if use_if_iuse minimal ; then |
| 44 |
- : |
| 45 |
elif ! in_iuse server || use_if_iuse server; then |
| 46 |
einfo "Including support files and sample configurations" |
| 47 |
docinto "support-files" |
| 48 |
|
| 49 |
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass |
| 50 |
index d045848127f..6c88c719893 100644 |
| 51 |
--- a/eclass/mysql-multilib-r1.eclass |
| 52 |
+++ b/eclass/mysql-multilib-r1.eclass |
| 53 |
@@ -598,22 +598,6 @@ multilib_src_install() { |
| 54 |
newins "${TMPDIR}/my.cnf.ok" my.cnf |
| 55 |
|
| 56 |
if use server ; then |
| 57 |
- einfo "Creating initial directories" |
| 58 |
- # Empty directories ... |
| 59 |
- diropts "-m0750" |
| 60 |
- if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then |
| 61 |
- dodir "${MY_DATADIR#${EPREFIX}}" |
| 62 |
- keepdir "${MY_DATADIR#${EPREFIX}}" |
| 63 |
- nonfatal fowners -R mysql:mysql "${D}/${MY_DATADIR}" |
| 64 |
- fi |
| 65 |
- |
| 66 |
- diropts "-m0755" |
| 67 |
- for folder in "${MY_LOGDIR#${EPREFIX}}" ; do |
| 68 |
- dodir "${folder}" |
| 69 |
- keepdir "${folder}" |
| 70 |
- nonfatal fowners -R mysql:mysql "${ED}/${folder}" |
| 71 |
- done |
| 72 |
- |
| 73 |
einfo "Including support files and sample configurations" |
| 74 |
docinto "support-files" |
| 75 |
for script in \ |
Archives