diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-11-14 12:04:48 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-11-14 12:04:48 +0000 |
| commit | 66ff810541d3af89832d116769988ce07bef72d9 (patch) | |
| tree | f319b45c6476bfe13349b4610e0b3807e7770c26 /eclass/eutils.eclass | |
| parent | Remove old versions, and old patches. (diff) | |
| download | gentoo-2-66ff810541d3af89832d116769988ce07bef72d9.tar.gz gentoo-2-66ff810541d3af89832d116769988ce07bef72d9.tar.bz2 gentoo-2-66ff810541d3af89832d116769988ce07bef72d9.zip | |
Support submount again and do globbing on the RHS
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 1df43022b866..0e54a782a510 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.263 2006/11/13 20:58:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.264 2006/11/14 12:04:48 uberlord Exp $ # # This eclass is for general purpose functions that most ebuilds # have to implement themselves. @@ -1402,7 +1402,9 @@ _cdrom_locate_file_on_cd() { local point= node= fs= foo= while read point node fs foo ; do - [[ *" ${fs} "* != " cd9660 iso9660 " ]] && continue + [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \ + ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ + && continue point=${point//\040/ } [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue export CDROM_ROOT=${point} |