From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RiKEv-00079w-TU for garchives@archives.gentoo.org; Wed, 04 Jan 2012 06:22:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 379F921C05C; Wed, 4 Jan 2012 06:22:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 016EE21C05C for ; Wed, 4 Jan 2012 06:22:13 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 658D01B4011 for ; Wed, 4 Jan 2012 06:22:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 372D12004B; Wed, 4 Jan 2012 06:22:12 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: savedconfig.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: savedconfig.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120104062212.372D12004B@flycatcher.gentoo.org> Date: Wed, 4 Jan 2012 06:22:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: caf2b82a-2296-4639-99af-42644498cf36 X-Archives-Hash: d1649d25ccc47d4d83d7cb7bcd9cbc51 vapier 12/01/04 06:22:12 Modified: savedconfig.eclass Log: check EBUILD_PHASE all the time in restore_config to catch mis-use even= when USE=3D-savedconfig Revision Changes Path 1.18 eclass/savedconfig.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/savedconfig= .eclass?rev=3D1.18&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/savedconfig= .eclass?rev=3D1.18&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/savedconfig= .eclass?r1=3D1.17&r2=3D1.18 Index: savedconfig.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/savedconfig.eclass,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- savedconfig.eclass 4 Jan 2012 06:19:09 -0000 1.17 +++ savedconfig.eclass 4 Jan 2012 06:22:12 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/savedconfig.eclass,v 1.17 2012= /01/04 06:19:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/savedconfig.eclass,v 1.18 2012= /01/04 06:22:12 vapier Exp $ =20 # @ECLASS: savedconfig.eclass # @MAINTAINER: @@ -76,12 +76,13 @@ # ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN} # @CODE restore_config() { - use savedconfig || return - case ${EBUILD_PHASE} in unpack|compile|configure|prepare) ;; *) die "Bad package! restore_config only for use in src_{unpack,compi= le,configure,prepare} functions!" ;; esac + + use savedconfig || return + local found check configfile local base=3D${PORTAGE_CONFIGROOT}/etc/portage/savedconfig for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do