Cleanup detection on warning for upgrade needed.

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

3 files changed, 16 insertions, 8 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/Manifest b/dev-db/mysql-init-scripts/Manifest
index 75c8f0373663..c505da9cdbe6 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -6,6 +6,6 @@ AUX mysql.rc6 10661 RMD160 0a0a1d84febd750a62cf331841b1bb765ccdae87 SHA1 35ceea9
 AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7
 AUX mysqlmanager.rc6 6632 RMD160 17fd2bdfcad0ca6e32e6ee91e1e0db7ce3263fef SHA1 18c6fc53a65a4f92dacd229585199b94f1c888cc SHA256 0d37cb3199a2752604a105d54340a61b9ee062e6c1d977a863628b694d93e96d
 EBUILD mysql-init-scripts-1.2.ebuild 766 RMD160 8cadfcc8f2b5af9914e2ec8eb3e8f64e8e4c151e SHA1 b9f43b8c5fb21de47e5cb6eb6ddf4af0d68bf8b7 SHA256 c052738cd94042676a6c082cfa2544acf3663c020e7705c5712a3c1254cbf762
-EBUILD mysql-init-scripts-2.0_pre1.ebuild 1884 RMD160 8e74026fc3ba09a116e82f5e93de1eca19d328f8 SHA1 59650e09c427c2535ec4bebc1aff02f18f7d7506 SHA256 e45780616f85c1ca15bf5dc678b4ad3cafe725965ee0a3738a6171049fe009d1
-MISC ChangeLog 1315 RMD160 839d917a7ad289cc3baa2a38dd57727405a8921c SHA1 16cb82cb16aa3fb321dd9a5289c3609167814dbb SHA256 54a15d8c94852a878ebb41b90dc4ec5492e97498f78237168787abc3965600ed
+EBUILD mysql-init-scripts-2.0_pre1-r1.ebuild 1970 RMD160 9c97e255198fbd54c7a4fb810b6c005ea6c4d049 SHA1 02bc6a04b0d534456eff59fda9aad82d5770ac39 SHA256 d39e0ed81d25aa03d531b8996390eeaf8d58689cf8dac2209bda5968c7a3183b
+MISC ChangeLog 1546 RMD160 3b6bf8c25017b0afbf776220b7593388ecbe587a SHA1 a86089116c4922080628ec21f4f0c9fb5bf70f54 SHA256 1f6a575e491786cd9d0b137f25e649dbabea8c901fa79fd697a12873ad5461d8
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
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!"