summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/mysql-init-scripts')
-rw-r--r--dev-db/mysql-init-scripts/files/init.d-2.04
-rw-r--r--dev-db/mysql-init-scripts/files/init.d-s64
-rw-r--r--dev-db/mysql-init-scripts/mysql-init-scripts-2.1.ebuild (renamed from dev-db/mysql-init-scripts/mysql-init-scripts-2.1_rc1.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 ec4f996db1e9..19a4b927dc48 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 3c6feeca2057..573ffbc0cf56 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
index dad018dc8dc6..dad018dc8dc6 100644
--- 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