dev-db/mariadb: Move --user bootstrap option to later in the commands
authorBrian Evans <grknight@gentoo.org>
Mon, 2 Oct 2017 15:18:54 +0000 (11:18 -0400)
committerBrian Evans <grknight@gentoo.org>
Mon, 2 Oct 2017 15:20:44 +0000 (11:20 -0400)
Closes: https://bugs.gentoo.org/show_bug.cgi?id=632694
Package-Manager: Portage-2.3.10, Repoman-2.3.3

dev-db/mariadb/mariadb-10.2.9.ebuild

index 8b02d53b17ab86ee749b231449fb39bb5c8d1efe..a8b5b56814aa7b566a01f38dcddd7cac37403c09 100644 (file)
@@ -929,8 +929,6 @@ pkg_config() {
                egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
        done
 
-       use prefix || options="${options} --user=mysql"
-
        einfo "Creating the mysql database and setting proper permissions on it ..."
 
        # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
@@ -963,6 +961,8 @@ pkg_config() {
        [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
        || die "MySQL databases not installed"
 
+       use prefix || options="${options} --user=mysql"
+
        local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
        local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
        local mysqld="${EROOT}/usr/sbin/mysqld \