diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2004-09-21 17:34:33 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2004-09-21 17:34:33 +0000 |
| commit | 0f18d5880d1b8837c8a1b649e3727df9ed072f62 (patch) | |
| tree | 80a26f5ec06c26e6a4d9c821a4a2a758af31be67 /eclass | |
| parent | Fixed gcc-3.4 compile issues and broken header in 3.74 ebuild (Manifest recom... (diff) | |
| download | gentoo-2-0f18d5880d1b8837c8a1b649e3727df9ed072f62.tar.gz gentoo-2-0f18d5880d1b8837c8a1b649e3727df9ed072f62.tar.bz2 gentoo-2-0f18d5880d1b8837c8a1b649e3727df9ed072f62.zip | |
Fixing * expansion in check_license and closing bug #63803.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 5c53fc11aa7f..fb9d421afe21 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.105 2004/09/19 21:36:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.106 2004/09/21 17:34:33 wolf31o2 Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -1127,11 +1127,16 @@ check_license() { # here is where we check for the licenses the user already # accepted ... if we don't find a match, we make the user accept + local shopts=$- local alic + set -o noglob #so that bash doesn't expand "*" for alic in ${ACCEPT_LICENSE} ; do - [ "${alic}" == "*" ] && return 0 - [ "${alic}" == "${l}" ] && return 0 + if [[ ${alic} == * || ${alic} == ${l} ]]; then + set +o noglob; set -${shopts} #reset old shell opts + return 0 + fi done + set +o noglob; set -$shopts #reset old shell opts local licmsg="`mymktemp ${T}`" cat << EOF > ${licmsg} |