[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Brian Evans]

commit:     3f9e1ccadbb179e26960138ffe9e0e4b394c3c57
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 16:23:01 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 16:23:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f9e1cca

dev-db/mysql-init-scripts: Version bump wrt bug 571508

Package-Manager: portage-2.3.0

 dev-db/mysql-init-scripts/files/init.d-2.0                            | 4 ++--
 dev-db/mysql-init-scripts/files/init.d-s6                             | 4 ++--
 ...ysql-init-scripts-2.1_rc1.ebuild => mysql-init-scripts-2.1.ebuild} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/mysql-init-scripts/files/init.d-2.0 
b/dev-db/mysql-init-scripts/files/init.d-2.0
index ec4f996..19a4b92 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.0
+++ b/dev-db/mysql-init-scripts/files/init.d-2.0
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -72,7 +72,7 @@ start() {
        if [ ! -d "${datadir}"/mysql ] ; then
                # find which package is installed to report an error
                local EROOT=$(portageq envvar EROOT)
-               local DBPKG_P=$(portageq match ${EROOT} $(portageq 
expand_virtual ${EROOT} virtual/mysql))
+               local DBPKG_P=$(portageq match ${EROOT} $(portageq 
expand_virtual ${EROOT} virtual/mysql | head -n1))
                if [ -z ${DBPKG_P} ] ; then
                        eerror "You don't appear to have a server package 
installed yet."
                else

diff --git a/dev-db/mysql-init-scripts/files/init.d-s6 
b/dev-db/mysql-init-scripts/files/init.d-s6
index 3c6feec..573ffbc 100644
--- a/dev-db/mysql-init-scripts/files/init.d-s6
+++ b/dev-db/mysql-init-scripts/files/init.d-s6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,7 +63,7 @@ start_pre() {
        if [ ! -d "${datadir}"/mysql ] ; then
                # find which package is installed to report an error
                local EROOT=$(portageq envvar EROOT)
-               local DBPKG_P=$(portageq match ${EROOT} $(portageq 
expand_virtual ${EROOT} virtual/mysql))
+               local DBPKG_P=$(portageq match ${EROOT} $(portageq 
expand_virtual ${EROOT} virtual/mysql | head -n1))
                if [ -z ${DBPKG_P} ] ; then
                        eerror "You don't appear to have a server package 
installed yet."
                else

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_rc1.ebuild 
b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1.ebuild
similarity index 100%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.1_rc1.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.1.ebuild