summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-14 12:12:06 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-14 12:12:06 +0000
commit976685d7e2588b80eea203d7928d13727bfce187 (patch)
tree2dad56dc639e383a9af0cca5a1ff9155a0fed2d7 /sys-process
parentRemove obsolete versions. (diff)
downloadgentoo-2-976685d7e2588b80eea203d7928d13727bfce187.tar.gz
gentoo-2-976685d7e2588b80eea203d7928d13727bfce187.tar.bz2
gentoo-2-976685d7e2588b80eea203d7928d13727bfce187.zip
Bug #226505 - For compatibility 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-process')
-rw-r--r--sys-process/vixie-cron/ChangeLog9
-rw-r--r--sys-process/vixie-cron/vixie-cron-4.1-r10.ebuild11
2 files changed, 15 insertions, 5 deletions
diff --git a/sys-process/vixie-cron/ChangeLog b/sys-process/vixie-cron/ChangeLog
index 5bda5ddce00d..9dc3534af703 100644
--- a/sys-process/vixie-cron/ChangeLog
+++ b/sys-process/vixie-cron/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-process/vixie-cron
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/vixie-cron/ChangeLog,v 1.53 2007/04/24 11:02:34 eroyf Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/vixie-cron/ChangeLog,v 1.54 2008/06/14 12:12:06 zmedico Exp $
+
+ 14 Jun 2008; Zac Medico <zmedico@gentoo.org> vixie-cron-4.1-r10.ebuild:
+ Bug #226505 - For compatibility with phase execution order in
+ >=portage-2.1.5, call has_version inside pkg_preinst instead of
+ pkg_postinst.
24 Apr 2007; Alexander Færøy <eroyf@gentoo.org>
vixie-cron-4.1-r10.ebuild:
diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r10.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r10.ebuild
index c7fbf156351f..c4ad40e3bf2f 100644
--- a/sys-process/vixie-cron/vixie-cron-4.1-r10.ebuild
+++ b/sys-process/vixie-cron/vixie-cron-4.1-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/vixie-cron/vixie-cron-4.1-r10.ebuild,v 1.11 2007/06/24 22:20:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/vixie-cron/vixie-cron-4.1-r10.ebuild,v 1.12 2008/06/14 12:12:06 zmedico Exp $
inherit cron toolchain-funcs pam
@@ -82,6 +82,11 @@ src_install() {
dodoc CHANGES CONVERSION FEATURES MAIL README THANKS
}
+pkg_preinst() {
+ has_version "<${CATEGORY}/${PN}-4.1-r10"
+ fix_spool_dir_perms=$?
+}
+
pkg_postinst() {
if [[ -f ${ROOT}/etc/init.d/vcron ]]
then
@@ -103,7 +108,7 @@ pkg_postinst() {
fi
# bug 164466
- if has_version '<sys-process/vixie-cron-4.1-r10' ; then
+ if [[ $fix_spool_dir_perms = 0 ]] ; then
echo
ewarn "Previous ebuilds didn't correctly set permissions on"
ewarn "the crontabs spool directory. Proper permissions are"