Redo how we handle forced gentoo-release update so we avoid md5/mtime mismatches with CONTENTS.

(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)

2 files changed, 16 insertions, 9 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 3e93a4acc82f..ee714aebfe6d 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.490 2010/12/05 17:39:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.491 2010/12/13 08:05:07 vapier Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  13 Dec 2010; Mike Frysinger <vapier@gentoo.org>
+  baselayout-2.0.1-r1.ebuild:
+  Redo how we handle forced gentoo-release update so we avoid md5/mtime
+  mismatches with CONTENTS.
+
   05 Dec 2010; Raúl Porcel <armin76@gentoo.org> baselayout-1.12.14-r1.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #343925
 
diff --git a/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
index d81cd02a1de7..777822104700 100644
--- a/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v 1.1 2010/11/04 00:33:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v 1.2 2010/12/13 08:05:07 vapier Exp $
 
 inherit eutils multilib
 
@@ -30,6 +30,11 @@ pkg_preinst() {
 	# upgrade, modify their timestamps.
 	touch "${ROOT}"/etc/conf.d/* 2>/dev/null
 
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+
 	# 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.
@@ -190,13 +195,10 @@ pkg_postinst() {
 		[ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
 	done
 
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
-	local release="${PV}"
-	[ "${PR}" != r0 ] && release="${release}-${PR}"
-	echo "Gentoo Base System release ${release}" > "${ROOT}"/etc/gentoo-release
+	# Take care of the etc-update for the user
+	if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
+	fi
 
 	# whine about users that lack passwords #193541
 	if [[ -e ${ROOT}/etc/shadow ]] ; then