| 1 |
mpagano 10/07/30 00:44:59 |
| 2 |
|
| 3 |
Modified: kernel-2.eclass |
| 4 |
Log: |
| 5 |
Proper use of shopt functions from eutils. Thanks to Vapier for the patch. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.238 eclass/kernel-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.238&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.238&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.237&r2=1.238 |
| 13 |
|
| 14 |
Index: kernel-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 17 |
retrieving revision 1.237 |
| 18 |
retrieving revision 1.238 |
| 19 |
diff -u -r1.237 -r1.238 |
| 20 |
--- kernel-2.eclass 19 Jul 2010 20:19:18 -0000 1.237 |
| 21 |
+++ kernel-2.eclass 30 Jul 2010 00:44:59 -0000 1.238 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.237 2010/07/19 20:19:18 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.238 2010/07/30 00:44:59 mpagano Exp $ |
| 27 |
|
| 28 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 29 |
# series of kernel with back-compatibility for 2.4 |
| 30 |
@@ -779,7 +779,7 @@ |
| 31 |
#============================================================== |
| 32 |
unipatch() { |
| 33 |
local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE |
| 34 |
- local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG extglob_bak |
| 35 |
+ local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG |
| 36 |
|
| 37 |
# set to a standard locale to ensure sorts are ordered properly. |
| 38 |
myLC_ALL="${LC_ALL}" |
| 39 |
@@ -791,8 +791,7 @@ |
| 40 |
[ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR} |
| 41 |
|
| 42 |
# We're gonna need it when doing patches with a predefined patchlevel |
| 43 |
- extglob_bak=$(shopt -p extglob) |
| 44 |
- shopt -s extglob |
| 45 |
+ eshopts_push -s extglob |
| 46 |
|
| 47 |
# This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers |
| 48 |
# usage can be either via an env var or by params |
| 49 |
@@ -926,6 +925,7 @@ |
| 50 |
eend 1 |
| 51 |
eerror "Failed to apply patch ${i/*\//}" |
| 52 |
eerror "Please attach ${STDERR_T} to any bug you may post." |
| 53 |
+ eshopts_pop |
| 54 |
die "Failed to apply ${i/*\//}" |
| 55 |
fi |
| 56 |
else |
| 57 |
@@ -935,6 +935,7 @@ |
| 58 |
if [ ${PATCH_DEPTH} -eq 5 ]; then |
| 59 |
eend 1 |
| 60 |
eerror "Please attach ${STDERR_T} to any bug you may post." |
| 61 |
+ eshopts_pop |
| 62 |
die "Unable to dry-run patch." |
| 63 |
fi |
| 64 |
done |
| 65 |
@@ -955,7 +956,7 @@ |
| 66 |
|
| 67 |
LC_ALL="${myLC_ALL}" |
| 68 |
LANG="${myLANG}" |
| 69 |
- eval ${extglob_bak} |
| 70 |
+ eshopts_pop |
| 71 |
} |
| 72 |
|
| 73 |
# getfilevar accepts 2 vars as follows: |
Archives