From 729ed2e556d7775c72a759c740904250bb8178bf Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Sun, 18 Feb 2007 03:43:57 +0000 Subject: Move scorefile checks to pkg_preinst; bug #167277 (Portage version: 2.1.2-r9) --- gnome-extra/gnome-games/ChangeLog | 7 ++++++- gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild | 7 +++++-- gnome-extra/gnome-games/gnome-games-2.16.2.ebuild | 7 +++++-- gnome-extra/gnome-games/gnome-games-2.16.3.ebuild | 7 +++++-- 4 files changed, 21 insertions(+), 7 deletions(-) (limited to 'gnome-extra') diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog index d6309f659c72..b0f181732a17 100644 --- a/gnome-extra/gnome-games/ChangeLog +++ b/gnome-extra/gnome-games/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gnome-games # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.188 2007/02/05 13:13:14 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.189 2007/02/18 03:43:57 dang Exp $ + + 18 Feb 2007; Daniel Gryniewicz + gnome-games-2.14.2.1.ebuild, gnome-games-2.16.2.ebuild, + gnome-games-2.16.3.ebuild: + Move scorefile checks to pkg_preinst; bug #167277 *gnome-games-2.16.3 (05 Feb 2007) diff --git a/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild index 54160bb74553..b384bafa2e03 100644 --- a/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild +++ b/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild,v 1.16 2007/01/10 19:44:50 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.14.2.1.ebuild,v 1.17 2007/02/18 03:43:57 dang Exp $ inherit eutils gnome2 autotools @@ -66,13 +66,16 @@ src_install() { [ -s ${game}/${doc} ] && dodoc ${game}/${doc} done done +} +pkg_preinst() { # Avoid overwriting previous .scores files local basefile for scorefile in ${D}/var/lib/games/*.scores; do basefile=$(basename $scorefile) if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then - rm ${scorefile} + cp "${ROOT}/var/lib/games/${basefile}" \ + "${D}/var/lib/games/${basefile}" fi done } diff --git a/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild index 4e888fcd7ce4..d8f60fb82b93 100644 --- a/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild +++ b/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild,v 1.12 2007/02/04 16:31:58 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.2.ebuild,v 1.13 2007/02/18 03:43:57 dang Exp $ # make sure games is inherited first so that the gnome2 # functions will be called if they are not overridden @@ -68,13 +68,16 @@ src_install() { [ -s ${game}/${doc} ] && dodoc ${game}/${doc} done done +} +pkg_preinst() { # Avoid overwriting previous .scores files local basefile for scorefile in ${D}/var/lib/games/*.scores; do basefile=$(basename $scorefile) if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then - rm ${scorefile} + cp "${ROOT}/var/lib/games/${basefile}" \ + "${D}/var/lib/games/${basefile}" fi done } diff --git a/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild b/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild index c519e155b419..86939cc9e987 100644 --- a/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild +++ b/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild,v 1.1 2007/02/05 13:13:14 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.16.3.ebuild,v 1.2 2007/02/18 03:43:57 dang Exp $ # make sure games is inherited first so that the gnome2 # functions will be called if they are not overridden @@ -68,13 +68,16 @@ src_install() { [ -s ${game}/${doc} ] && dodoc ${game}/${doc} done done +} +pkg_preinst() { # Avoid overwriting previous .scores files local basefile for scorefile in ${D}/var/lib/games/*.scores; do basefile=$(basename $scorefile) if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then - rm ${scorefile} + cp "${ROOT}/var/lib/games/${basefile}" \ + "${D}/var/lib/games/${basefile}" fi done } -- cgit v1.2.3-65-gdbad