diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-02-17 00:11:42 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-02-17 00:11:42 +0000 |
| commit | 24ee58b44a44b575f4772c9e53b4e66125063736 (patch) | |
| tree | de94598e0eab5d94d28ff2f9517512b0ee3c94d5 /eclass | |
| parent | Removed allanonjl from metadata.xml (diff) | |
| download | gentoo-2-24ee58b44a44b575f4772c9e53b4e66125063736.tar.gz gentoo-2-24ee58b44a44b575f4772c9e53b4e66125063736.tar.bz2 gentoo-2-24ee58b44a44b575f4772c9e53b4e66125063736.zip | |
combine USE and IUSE file existence check
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 7765685d860e..b820fe399e73 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.273 2007/02/14 16:49:46 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.274 2007/02/17 00:11:42 vapier Exp $ # # This eclass is for general purpose functions that most ebuilds # have to implement themselves. @@ -1650,13 +1650,9 @@ built_with_use() { local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE - # if the USE file doesnt exist, assume the $PKG is either - # injected or package.provided - [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with" - # if the IUSE file doesn't exist, the read will error out, we need to handle # this gracefully - if [[ ! -e ${IUSEFILE} ]] ; then + if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} ]] ; then case ${missing_action} in true) return 0;; false) return 1;; |