diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-05-18 04:46:22 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-05-18 04:46:22 +0000 |
| commit | 24efaa42bd453e91d8a5c5c0325bd2f3c8ee0987 (patch) | |
| tree | 87df730c97ccd67d6fbef70cfdbecf45c35a47c8 /dev-db | |
| parent | Version bump. (diff) | |
| download | gentoo-2-24efaa42bd453e91d8a5c5c0325bd2f3c8ee0987.tar.gz gentoo-2-24efaa42bd453e91d8a5c5c0325bd2f3c8ee0987.tar.bz2 gentoo-2-24efaa42bd453e91d8a5c5c0325bd2f3c8ee0987.zip | |
we only need to do the unmerge of an old mysql if a local mysql database exists.
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.1.12.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index d5336a341160..58ae8bb17c62 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.200 2005/05/17 20:19:42 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.201 2005/05/18 04:46:22 robbat2 Exp $ 17 May 2005; Markus Rothe <corsair@gentoo.org> mysql-4.1.12.ebuild: Added ~ppc64 to KEYWORDS + 18 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.1.12.ebuild: + we only need to do the unmerge of an old mysql if a local mysql database + exists. + 17 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.24-r2.ebuild, mysql-4.1.12.ebuild: Cleanup a few minor things. diff --git a/dev-db/mysql/mysql-4.1.12.ebuild b/dev-db/mysql/mysql-4.1.12.ebuild index 89896e34241a..6d56120a4ccb 100644 --- a/dev-db/mysql/mysql-4.1.12.ebuild +++ b/dev-db/mysql/mysql-4.1.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.12.ebuild,v 1.4 2005/05/17 20:19:43 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.12.ebuild,v 1.5 2005/05/18 04:46:22 robbat2 Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -76,15 +76,16 @@ mysql_get_datadir() { } pkg_setup() { + mysql_get_datadir if ! useq minimal ; then if has_version "<=dev-db/mysql-4.1.4" \ - && ! built_with_use dev-db/mysql minimal ; then + && ! built_with_use dev-db/mysql minimal \ + && [ -d "${DATADIR}/mysql" ]; then mysql_upgrade_error die fi fi mysql_upgrade_warning - mysql_get_datadir } src_unpack() { |