diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-01-03 19:57:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-03 19:57:10 +0000 |
| commit | 95efa7c9368d2c608d66a8167d5ca0ea72af01e8 (patch) | |
| tree | 3a437e77a64bee6c30be02e955b6572030974543 /eclass | |
| parent | amd64 stable wrt #299365 (diff) | |
| download | gentoo-2-95efa7c9368d2c608d66a8167d5ca0ea72af01e8.tar.gz gentoo-2-95efa7c9368d2c608d66a8167d5ca0ea72af01e8.tar.bz2 gentoo-2-95efa7c9368d2c608d66a8167d5ca0ea72af01e8.zip | |
Bug #281314 - Do die if the license file can not be found until after
ACCEPT_LICENSE has been checked (since it may not be necessary to die).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 0df4c171e030..2be2bf88d903 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.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/eutils.eclass,v 1.323 2009/12/19 00:01:04 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.324 2010/01/03 19:57:10 zmedico Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1382,7 +1382,6 @@ check_license() { lic="${lic}" fi fi - [ ! -f "${lic}" ] && die "Could not find requested license ${lic}" local l="`basename ${lic}`" # here is where we check for the licenses the user already @@ -1396,6 +1395,7 @@ check_license() { fi done eshopts_pop + [ ! -f "${lic}" ] && die "Could not find requested license ${lic}" local licmsg=$(emktemp) cat <<-EOF > ${licmsg} |