[gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass

[Zac Medico (zmedico)]

zmedico     10/01/03 19:57:10

  Modified:             eutils.eclass
  Log:
  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).

Revision  Changes    Path
1.324                eclass/eutils.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.324&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.324&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?r1=1.323&r2=1.324

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- eutils.eclass	19 Dec 2009 00:01:04 -0000	1.323
+++ eutils.eclass	3 Jan 2010 19:57:10 -0000	1.324
@@ -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 @@
 			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 @@
 		fi
 	done
 	eshopts_pop
+	[ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
 
 	local licmsg=$(emktemp)
 	cat <<-EOF > ${licmsg}