diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-01-14 03:34:52 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-01-14 03:34:52 +0000 |
| commit | ebbacc0ded70cf1092d660a4381023357177df88 (patch) | |
| tree | 6124e9ed9040a841ac5d66f138b423997b092c62 /dev-db/mysql-init-scripts | |
| parent | Fix installation. (diff) | |
| download | gentoo-2-ebbacc0ded70cf1092d660a4381023357177df88.tar.gz gentoo-2-ebbacc0ded70cf1092d660a4381023357177df88.tar.bz2 gentoo-2-ebbacc0ded70cf1092d660a4381023357177df88.zip | |
Cleanup detection on warning for upgrade needed.
(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 | 8 | ||||
| -rw-r--r-- | dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r1.ebuild (renamed from dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild) | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog index b0b0a9a8bf7b..ad3857a9c2ea 100644 --- a/dev-db/mysql-init-scripts/ChangeLog +++ b/dev-db/mysql-init-scripts/ChangeLog @@ -1,6 +1,12 @@ # 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.5 2011/01/13 20:06:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.6 2011/01/14 03:34:52 robbat2 Exp $ + +*mysql-init-scripts-2.0_pre1-r1 (14 Jan 2011) + + 14 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> + -mysql-init-scripts-2.0_pre1.ebuild, +mysql-init-scripts-2.0_pre1-r1.ebuild: + Cleanup detection on warning for upgrade needed. *mysql-init-scripts-2.0_pre1 (13 Jan 2011) diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r1.ebuild index 0aa522b36e4b..f3196f129881 100644 --- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1.ebuild +++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r1.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.ebuild,v 1.3 2011/01/13 21:56:39 mr_bones_ Exp $ +# $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 $ DESCRIPTION="Gentoo MySQL init scripts." HOMEPAGE="http://www.gentoo.org/" @@ -28,22 +28,24 @@ src_install() { pkg_postinst() { grep -sq mysql_slot "${ROOT}"/etc/conf.d/mysql old_conf_present=$? - grep -sq mysql_slot "${ROOT}"/etc/init.d/mysql + grep -sq get_slot_config "${ROOT}"/etc/init.d/mysql old_init_present=$? egrep -sq 'MY_CNF|MY_ARGS|(STARTUP|STOP)_TIMEOUT' "${ROOT}"/etc/conf.d/mysql new_conf_present=$? - grep -sq 'MY_CNF|MY_ARGS|(STARTUP|STOP)_TIMEOUT' "${ROOT}"/etc/init.d/mysql + egrep -sq 'MY_ARGS|STOP_TIMEOUT' "${ROOT}"/etc/init.d/mysql new_init_present=$? einfo "Please note if you are using multiple internal 'slots' in the old" einfo "conf.d fille, that you should use multiple init files now." + echo old $old_conf_present $old_init_present + echo new $new_conf_present $new_init_present # new scripts present - if [ $new_conf_present -eq 0 -a $new_init_present -eq 0 -a + if [ $new_conf_present -eq 0 -a $new_init_present -eq 0 -a \ $old_conf_present -eq 1 -a $old_init_present -eq 1 ]; then : - elif [ $old_conf_present -eq 0 -a $old_init_present -eq 0 -a + elif [ $old_conf_present -eq 0 -a $old_init_present -eq 0 -a \ $new_conf_present -eq 1 -a $new_init_present -eq 1 ]; then ewarn "Old /etc/init.d/mysql and /etc/conf.d/mysql still present!" ewarn "Update both of those files to the new versions!" |