summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-14 11:02:06 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-14 11:02:06 +0000
commit124b33fe66987bd57c6bf550b326e854322dff0d (patch)
tree12046f23c68ea1ebba8da72e11484c43b922d729 /sys-cluster
parentRemove old versions and old patches. The 4.3 fix is no more needed in 0.80 ei... (diff)
downloadgentoo-2-124b33fe66987bd57c6bf550b326e854322dff0d.tar.gz
gentoo-2-124b33fe66987bd57c6bf550b326e854322dff0d.tar.bz2
gentoo-2-124b33fe66987bd57c6bf550b326e854322dff0d.zip
Bug #226505 - For compatibity with phase execution order in >=portage-2.1.5,
call has_version inside pkg_preinst instead of pkg_postinst. (Portage version: 2.2_pre10652/cvs/Linux 2.6.25-0518-x86-64 i686)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/util-vserver/ChangeLog7
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.214.ebuild9
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.215.ebuild9
3 files changed, 20 insertions, 5 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 8c00b247232a..219038415717 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-cluster/util-vserver
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.91 2008/05/13 14:45:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.92 2008/06/14 11:02:06 zmedico Exp $
+
+ 14 Jun 2008; Zac Medico <zmedico@gentoo.org> util-vserver-0.30.214.ebuild,
+ util-vserver-0.30.215.ebuild:
+ Bug #226505 - For compatibity with phase execution order in >=portage-2.1.5,
+ call has_version inside pkg_preinst instead of pkg_postinst.
13 May 2008; Jeroen Roovers <jer@gentoo.org> util-vserver-0.30.215.ebuild:
Marked ~hppa (LuckyLuke).
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
index 668539b8b564..250821253514 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.4 2008/04/13 10:24:11 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.5 2008/06/14 11:02:06 zmedico Exp $
WANT_AUTOMAKE="1.9"
@@ -76,6 +76,11 @@ src_install() {
dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
}
+pkg_preinst() {
+ has_version "<${CATEGORY}/${PN}-0.30.211"
+ old_init_script_warn=$?
+}
+
pkg_postinst() {
# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
# present when merging.
@@ -95,7 +100,7 @@ pkg_postinst() {
elog " rc-update add vprocunhide default"
elog
- if has_version "<${CATEGORY}/${PN}-0.30.211" ; then
+ if [[ $old_init_script_warn = 0 ]] ; then
ewarn "Please make sure, that you remove the old init-script from any"
ewarn "runlevel and remove it from your init.d dir!"
ewarn
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
index ec15cde1c318..01f9606d26f9 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild,v 1.3 2008/05/13 14:45:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild,v 1.4 2008/06/14 11:02:06 zmedico Exp $
WANT_AUTOMAKE="1.9"
@@ -76,6 +76,11 @@ src_install() {
dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
}
+pkg_preinst() {
+ has_version "<${CATEGORY}/${PN}-0.30.211"
+ old_init_script_warn=$?
+}
+
pkg_postinst() {
# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
# present when merging.
@@ -95,7 +100,7 @@ pkg_postinst() {
elog " rc-update add vprocunhide default"
elog
- if has_version "<${CATEGORY}/${PN}-0.30.211" ; then
+ if [[ $old_init_script_warn = 0 ]] ; then
ewarn "Please make sure, that you remove the old init-script from any"
ewarn "runlevel and remove it from your init.d dir!"
ewarn