Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Cc: James Le Cuirot <chewi@g.o>
Subject: [gentoo-dev] [PATCH 05/14] cdrom.eclass: Remove ye olde Submount check
Date: Mon, 17 Apr 2017 21:58:17
Message-Id: 20170417215359.30641-6-chewi@gentoo.org
In Reply to: [gentoo-dev] [PATCH] cdrom.eclass: Near rewrite by James Le Cuirot
1 Submount was last-rited in 2007 and was already dead long before that.
2 ---
3 eclass/cdrom.eclass | 4 +---
4 1 file changed, 1 insertion(+), 3 deletions(-)
5
6 diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
7 index 9724c66ca2ce..681683f9328c 100644
8 --- a/eclass/cdrom.eclass
9 +++ b/eclass/cdrom.eclass
10 @@ -181,9 +181,7 @@ _cdrom_locate_file_on_cd() {
11 while [[ -n ${cdset[${i}]} ]] ; do
12 local point= node= fs= foo=
13 while read point node fs foo ; do
14 - [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
15 - ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
16 - && continue
17 + [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && continue
18 point=${point//\040/ }
19 export CDROM_MATCH=$(_cdrom_glob_match "${point}" "${cdset[${i}]}")
20 [[ -z ${CDROM_MATCH} ]] && continue
21 --
22 2.11.0