diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-08-22 23:22:47 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-08-22 23:22:47 +0000 |
| commit | 05e67a993c833b67716ccf91b23d5b8e302d374e (patch) | |
| tree | 5519620729db70918f600de963c16bef94d5889f /net-nds | |
| parent | Version bump (diff) | |
| download | gentoo-2-05e67a993c833b67716ccf91b23d5b8e302d374e.tar.gz gentoo-2-05e67a993c833b67716ccf91b23d5b8e302d374e.tar.bz2 gentoo-2-05e67a993c833b67716ccf91b23d5b8e302d374e.zip | |
Backport FORCE_UPGRADE to old 2.3 major series.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.3.43-r1.ebuild | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 1fbc8a4e18a7..12fd78c41720 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.385 2011/08/11 07:56:54 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.386 2011/08/22 23:22:47 robbat2 Exp $ + + 22 Aug 2011; Robin H. Johnson <robbat2@gentoo.org> openldap-2.3.43-r1.ebuild: + Backport FORCE_UPGRADE to old 2.3 major series. *openldap-2.4.25-r1 (11 Aug 2011) diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild index a7cc6192a6a7..7344b6739495 100644 --- a/net-nds/openldap/openldap-2.3.43-r1.ebuild +++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.8 2010/04/11 15:24:10 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.9 2011/08/22 23:22:47 robbat2 Exp $ EAPI="2" @@ -85,7 +85,12 @@ openldap_upgrade_howto() { eerror "10. check that your data is intact." eerror "11. set up the new replication system." eerror - die "You need to upgrade your database first" + if [ "${FORCE_UPGRADE}" != "1" ]; then + die "You need to upgrade your database first" + else + eerror "You have the magical FORCE_UPGRADE=1 in place." + eerror "Don't say you weren't warned about data loss." + fi } openldap_find_versiontags() { |