diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-07-18 21:57:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-07-18 21:57:20 +0000 |
| commit | 9979d2dd11723779d3e1bbd85762ed53f7bdc6c2 (patch) | |
| tree | c5837098a1f80e01966ea8ed34aacfe82677f218 | |
| parent | Version bump #328359 by Lars Wendler. (diff) | |
| download | gentoo-2-9979d2dd11723779d3e1bbd85762ed53f7bdc6c2.tar.gz gentoo-2-9979d2dd11723779d3e1bbd85762ed53f7bdc6c2.tar.bz2 gentoo-2-9979d2dd11723779d3e1bbd85762ed53f7bdc6c2.zip | |
convert to eshopts_{push,pop}
| -rw-r--r-- | eclass/rpm.eclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass index b6b8341b5a14..21c7f24575a4 100644 --- a/eclass/rpm.eclass +++ b/eclass/rpm.eclass @@ -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/rpm.eclass,v 1.19 2009/10/05 06:14:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.20 2010/07/18 21:57:20 vapier Exp $ # @ECLASS: rpm.eclass # @MAINTAINER: @@ -47,8 +47,7 @@ srcrpm_unpack() { # no .src.rpm files, then nothing to do [[ "$* " != *".src.rpm " ]] && return 0 - local old_shopts=$(shopt -p nullglob) - shopt -s nullglob + eshopts_push -s nullglob # unpack everything local a @@ -57,7 +56,7 @@ srcrpm_unpack() { rm -f "${a}" done - eval "${old_shopts}" + eshopts_pop return 0 } |