diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-10-13 15:12:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-10-13 15:12:15 +0000 |
| commit | b73cad8f2b65a1fc7a775c2e0ee7370458206a2d (patch) | |
| tree | 60f1e788ce8aa93780a4c0691c13210c1eb30e53 /eclass/eutils.eclass | |
| parent | closing #24762 (diff) | |
| download | gentoo-2-b73cad8f2b65a1fc7a775c2e0ee7370458206a2d.tar.gz gentoo-2-b73cad8f2b65a1fc7a775c2e0ee7370458206a2d.tar.bz2 gentoo-2-b73cad8f2b65a1fc7a775c2e0ee7370458206a2d.zip | |
and properly detect accept licenses
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index b0e74f4bbded..4d75744401ad 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.63 2003/10/13 15:00:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.64 2003/10/13 15:12:15 vapier Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -994,13 +994,14 @@ check_license() { fi fi [ ! -f "${lic}" ] && die "Could not find requested license ${src}" + local l="`basename ${lic}`" # 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 alic - for alic in "${ACCEPT_LICENSE}" ; do + for alic in ${ACCEPT_LICENSE} ; do [ "${alic}" == "*" ] && return 0 - [ "${alic}" == "${lic}" ] && return 0 + [ "${alic}" == "${l}" ] && return 0 done local licmsg="`mymktemp ${T}`" @@ -1015,7 +1016,7 @@ CTRL+C out of this, the install will not run! EOF cat ${lic} >> ${licmsg} ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" - einfon "Do you accept the terms of this license? [yes/no] " + einfon "Do you accept the terms of this license (${l})? [yes/no] " read alic case ${alic} in yes|Yes|y|Y) |