Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 290539 Details for
Bug 388125
dev-db/mysql-5.1.59 fails to emerge on prefixed systems due to new eclasses
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
eprefixified mysql_fx.eclass
mysql_fx.eclass.patch (text/plain), 1.64 KB, created by
nietonfir
on 2011-10-22 17:39:51 UTC
(
hide
)
Description:
eprefixified mysql_fx.eclass
Filename:
MIME Type:
Creator:
nietonfir
Created:
2011-10-22 17:39:51 UTC
Size:
1.64 KB
patch
obsolete
>--- old/mysql_fx.eclass 2011-10-22 19:21:56.000000000 +0200 >+++ new/mysql_fx.eclass 2011-10-22 19:16:20.000000000 +0200 >@@ -234,12 +234,12 @@ > > if [[ -z "${MY_DATADIR}" ]] ; then > MY_DATADIR="" >- if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then >+ if [[ -f "${EPREFIX}${MY_SYSCONFDIR}/my.cnf" ]] ; then > MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ > | sed -ne '/datadir/s|^--datadir=||p' \ > | tail -n1` > if [[ -z "${MY_DATADIR}" ]] ; then >- MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ >+ MY_DATADIR=`grep ^datadir "${EPREFIX}${MY_SYSCONFDIR}/my.cnf" \ > | sed -e 's/.*=\s*//' \ > | tail -n1` > fi >@@ -247,13 +247,16 @@ > if [[ -z "${MY_DATADIR}" ]] ; then > MY_DATADIR="${MY_LOCALSTATEDIR}" > einfo "Using default MY_DATADIR" >+ else >+ # strip leading EPREFIX returned by already installed mysql >+ MY_DATADIR="${MY_DATADIR#${EPREFIX}}" > fi >- elog "MySQL MY_DATADIR is ${MY_DATADIR}" >+ elog "MySQL MY_DATADIR is ${EPREFIX}${MY_DATADIR}" > > if [[ -z "${PREVIOUS_DATADIR}" ]] ; then >- if [[ -e "${MY_DATADIR}" ]] ; then >+ if [[ -e "${EPREFIX}${MY_DATADIR}" ]] ; then > # If you get this and you're wondering about it, see bug #207636 >- elog "MySQL datadir found in ${MY_DATADIR}" >+ elog "MySQL datadir found in ${EPREFIX}${MY_DATADIR}" > elog "A new one will not be created." > PREVIOUS_DATADIR="yes" > else >@@ -272,7 +275,8 @@ > ewarn "MySQL MY_DATADIR has changed" > ewarn "from ${MY_DATADIR}" > ewarn "to ${new_MY_DATADIR}" >- MY_DATADIR="${new_MY_DATADIR}" >+ # strip leading EPREFIX returned by already installed mysql >+ MY_DATADIR="${new_MY_DATADIR#${EPREFIX}}" > fi > fi > fi
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 388125
:
290535
|
290537
|
290539
|
291977
|
292037
|
296349