diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-10-14 21:55:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-10-14 21:55:35 +0000 |
| commit | ef1671ba002074fc17868197f278efe597bc8a7d (patch) | |
| tree | a6491a17797bb5691a7926c691076fecf2bf67e0 | |
| parent | bump to 5.20.1 (diff) | |
| download | gentoo-2-ef1671ba002074fc17868197f278efe597bc8a7d.tar.gz gentoo-2-ef1671ba002074fc17868197f278efe597bc8a7d.tar.bz2 gentoo-2-ef1671ba002074fc17868197f278efe597bc8a7d.zip | |
fix from James Le Cuirot to check to see if the directory to search exists before searching it to avoid confusing messages being posted #195864
| -rw-r--r-- | eclass/eutils.eclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index af96570b5e15..88b9318feb97 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.291 2007/10/10 20:34:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.292 2007/10/14 21:55:35 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1477,6 +1477,7 @@ _cdrom_locate_file_on_cd() { ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ && continue point=${point//\040/ } + [[ ! -d ${point}/${dir} ]] && continue [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue export CDROM_ROOT=${point} export CDROM_SET=${i} |