summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-17 17:42:18 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-17 17:42:18 +0000
commit5fbf4cf0b19552f751b83e47d5c56a0b43d290d9 (patch)
treeac536f01200be706b41f4e64bddffc9a98bbd8f3 /sys-apps/baselayout
parentStable on ppc wrt bug 217467 (diff)
downloadgentoo-2-5fbf4cf0b19552f751b83e47d5c56a0b43d290d9.tar.gz
gentoo-2-5fbf4cf0b19552f751b83e47d5c56a0b43d290d9.tar.bz2
gentoo-2-5fbf4cf0b19552f751b83e47d5c56a0b43d290d9.zip
Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of the
baselayout-1.x ebuild copies all the real configs from the user's /etc/conf.d into ${D}, it makes them all appear to be the default versions. In order to protect them from being unmerged after this upgrade, modify their timestamps during pkg_preinst(). (Portage version: 2.1.5_rc4_p9919)
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/ChangeLog9
-rw-r--r--sys-apps/baselayout/baselayout-2.0.0.ebuild9
2 files changed, 16 insertions, 2 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 2081bdc9d1f9..d8c78ee38433 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,17 @@
# ChangeLog for sys-apps/baselayout
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.465 2008/04/08 01:31:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.466 2008/04/17 17:42:18 zmedico Exp $
# See the rc-scripts ChangeLog in subversion for release info:
# http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
+ 17 Apr 2008; Zac Medico <zmedico@gentoo.org> baselayout-2.0.0.ebuild:
+ Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of the
+ baselayout-1.x ebuild copies all the real configs from the user's
+ /etc/conf.d into ${D}, it makes them all appear to be the default
+ versions. In order to protect them from being unmerged after this upgrade,
+ modify their timestamps during pkg_preinst().
+
08 Apr 2008; Ryan Hill <dirtyepic@gentoo.org> baselayout-2.0.0.ebuild:
Keyword ~mips.
diff --git a/sys-apps/baselayout/baselayout-2.0.0.ebuild b/sys-apps/baselayout/baselayout-2.0.0.ebuild
index 0e048e0f6a73..92084b9338e6 100644
--- a/sys-apps/baselayout/baselayout-2.0.0.ebuild
+++ b/sys-apps/baselayout/baselayout-2.0.0.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-apps/baselayout/baselayout-2.0.0.ebuild,v 1.2 2008/04/08 01:31:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.3 2008/04/17 17:42:18 zmedico Exp $
inherit multilib
@@ -17,6 +17,13 @@ IUSE="build"
PDEPEND="sys-apps/openrc"
pkg_preinst() {
+ # Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
+ # the baselayout-1.x ebuild copies all the real configs from the user's
+ # /etc/conf.d into ${D}, it makes them all appear to be the default
+ # versions. In order to protect them from being unmerged after this
+ # upgrade, modify their timestamps.
+ touch "${ROOT}"/etc/conf.d/* 2>/dev/null
+
# We need to install directories and maybe some dev nodes when building
# stages, but they cannot be in CONTENTS.
# Also, we cannot reference $S as binpkg will break so we do this.