[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

["Mike Pagano (mpagano)" <mpagano@gentoo.org>]

mpagano     10/07/30 00:44:59

  Modified:             kernel-2.eclass
  Log:
  Proper use of shopt functions from eutils. Thanks to Vapier for the patch.

Revision  Changes    Path
1.238                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.238&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.238&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.237&r2=1.238

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- kernel-2.eclass	19 Jul 2010 20:19:18 -0000	1.237
+++ kernel-2.eclass	30 Jul 2010 00:44:59 -0000	1.238
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.237 2010/07/19 20:19:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.238 2010/07/30 00:44:59 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -779,7 +779,7 @@
 #==============================================================
 unipatch() {
 	local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE
-	local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG extglob_bak
+	local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG
 
 	# set to a standard locale to ensure sorts are ordered properly.
 	myLC_ALL="${LC_ALL}"
@@ -791,8 +791,7 @@
 	[ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR}
 
 	# We're gonna need it when doing patches with a predefined patchlevel
-	extglob_bak=$(shopt -p extglob)
-	shopt -s extglob
+	eshopts_push -s extglob
 
 	# This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers
 	# usage can be either via an env var or by params
@@ -926,6 +925,7 @@
 						eend 1
 						eerror "Failed to apply patch ${i/*\//}"
 						eerror "Please attach ${STDERR_T} to any bug you may post."
+						eshopts_pop
 						die "Failed to apply ${i/*\//}"
 					fi
 				else
@@ -935,6 +935,7 @@
 			if [ ${PATCH_DEPTH} -eq 5 ]; then
 				eend 1
 				eerror "Please attach ${STDERR_T} to any bug you may post."
+				eshopts_pop
 				die "Unable to dry-run patch."
 			fi
 		done
@@ -955,7 +956,7 @@
 
 	LC_ALL="${myLC_ALL}"
 	LANG="${myLANG}"
-	eval ${extglob_bak}
+	eshopts_pop
 }
 
 # getfilevar accepts 2 vars as follows: