summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-05-24 04:35:49 +0000
committerMike Frysinger <vapier@gentoo.org>2015-05-24 04:35:49 +0000
commit2564488fe13420cbeb01e4621ef53f4c04c77939 (patch)
tree49275b9455056d16403b804b8cbd4e90825daa06 /eclass
parentDrop dead r600-llvm-compiler USE flag from package.use.mask. (diff)
downloadgentoo-2-2564488fe13420cbeb01e4621ef53f4c04c77939.tar.gz
gentoo-2-2564488fe13420cbeb01e4621ef53f4c04c77939.tar.bz2
gentoo-2-2564488fe13420cbeb01e4621ef53f4c04c77939.zip
pkg_config: tweak user messages
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mysql-multilib.eclass7
-rw-r--r--eclass/mysql-v2.eclass7
-rw-r--r--eclass/mysql.eclass7
3 files changed, 9 insertions, 12 deletions
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 60591f307fc6..1596959888e4 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.19 2015/05/01 12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.20 2015/05/24 04:35:49 vapier Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -879,8 +879,7 @@ mysql-multilib_pkg_config() {
mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb"
fi
- einfo "Creating the mysql database and setting proper"
- einfo "permissions on it ..."
+ 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
PID_DIR="${EROOT}/var/run/mysqld"
@@ -955,7 +954,7 @@ mysql-multilib_pkg_config() {
-e "${sql}"
eend $?
- ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
"${EROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index af1aecfe263f..b75cf9873147 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.38 2015/05/01 12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.39 2015/05/24 04:35:49 vapier Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@@ -818,8 +818,7 @@ mysql-v2_pkg_config() {
mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb"
fi
- einfo "Creating the mysql database and setting proper"
- einfo "permissions on it ..."
+ 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
PID_DIR="${EROOT}/var/run/mysqld"
@@ -894,7 +893,7 @@ mysql-v2_pkg_config() {
-e "${sql}"
eend $?
- ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
"${EROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 7a129fcf239c..b021b8ce0f4f 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.182 2015/05/01 12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.183 2015/05/24 04:35:49 vapier Exp $
# @ECLASS: mysql.eclass
# @MAINTAINER:
@@ -1461,8 +1461,7 @@ mysql_pkg_config() {
fi
fi
- einfo "Creating the mysql database and setting proper"
- einfo "permissions on it ..."
+ einfo "Creating the mysql database and setting proper permissions on it ..."
local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
@@ -1502,7 +1501,7 @@ mysql_pkg_config() {
-e "${sql}"
eend $?
- ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
+ ebegin "Loading \"zoneinfo\", this step may require a few seconds"
"${EROOT}/usr/bin/mysql" \
--socket=${socket} \
-hlocalhost \