[gentoo-commits] gentoo-x86 commit in eclass: savedconfig.eclass

[Mike Frysinger (vapier)]

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=-savedconfig

Revision  Changes    Path
1.18                 eclass/savedconfig.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/savedconfig.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/savedconfig.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/savedconfig.eclass?r1=1.17&r2=1.18

Index: savedconfig.eclass
===================================================================
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 $
 
 # @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,compile,configure,prepare} functions!" ;;
 	esac
+
+	use savedconfig || return
+
 	local found check configfile
 	local base=${PORTAGE_CONFIGROOT}/etc/portage/savedconfig
 	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do