diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-01-15 17:54:31 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-01-15 17:54:31 +0000 |
| commit | 33ea4d59ef315021891d08285f09a98218ad5684 (patch) | |
| tree | bcce0dd640f86df4f810224484c17a5c85d36a7d /dev-db/mysql-init-scripts | |
| parent | Version bump (diff) | |
| download | gentoo-2-33ea4d59ef315021891d08285f09a98218ad5684.tar.gz gentoo-2-33ea4d59ef315021891d08285f09a98218ad5684.tar.bz2 gentoo-2-33ea4d59ef315021891d08285f09a98218ad5684.zip | |
Bug #351611: Avoid false-postive failure return value preventing the init script from starting.
(Portage version: 2.2.0_alpha15/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/mysql-init-scripts')
| -rw-r--r-- | dev-db/mysql-init-scripts/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d | 6 | ||||
| -rw-r--r-- | dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild (renamed from dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r1.ebuild) | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog index ad3857a9c2ea..4c0be85d5b99 100644 --- a/dev-db/mysql-init-scripts/ChangeLog +++ b/dev-db/mysql-init-scripts/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-db/mysql-init-scripts # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.6 2011/01/14 03:34:52 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.7 2011/01/15 17:54:31 robbat2 Exp $ + +*mysql-init-scripts-2.0_pre1-r2 (15 Jan 2011) + + 15 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> + -mysql-init-scripts-2.0_pre1-r1.ebuild, + +mysql-init-scripts-2.0_pre1-r2.ebuild, files/mysql-5.1.53-conf.d: + Bug #351611: Avoid false-postive failure return value preventing the init + script from starting. *mysql-init-scripts-2.0_pre1-r1 (14 Jan 2011) diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d index a53440b3bcce..df4c3a467690 100644 --- a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d +++ b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.1 2011/01/13 20:06:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.2 2011/01/15 17:54:31 robbat2 Exp $ # If you want a non-stock location for the config file, uncomment or update # either of these as needed. If you do use it, you must make sure that none of @@ -72,4 +72,8 @@ STOP_TIMEOUT=120 # But uncomment this next instead if you think it should. #rc_provide="mysql" +# The conditional above has a false-positive "failure" return value as a +# side-effect, and since it's the last statement, without the next line, this +# script returns failure. +return 0 # vim: ft=gentoo-conf-d et ts=4 sw=4: diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild index f3196f129881..4fbf266e5586 100644 --- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r1.ebuild +++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r1.ebuild,v 1.1 2011/01/14 03:34:52 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild,v 1.1 2011/01/15 17:54:31 robbat2 Exp $ DESCRIPTION="Gentoo MySQL init scripts." HOMEPAGE="http://www.gentoo.org/" |