From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70349139694 for ; Mon, 17 Apr 2017 21:58:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C69FB21C127; Mon, 17 Apr 2017 21:54:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8574521C102 for ; Mon, 17 Apr 2017 21:54:39 +0000 (UTC) Received: from symphony.aura-online.co.uk (154.189.187.81.in-addr.arpa [81.187.189.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: chewi) by smtp.gentoo.org (Postfix) with ESMTPSA id D51D1340AC7; Mon, 17 Apr 2017 21:54:37 +0000 (UTC) From: James Le Cuirot To: gentoo-dev Cc: James Le Cuirot Subject: [gentoo-dev] [PATCH 05/14] cdrom.eclass: Remove ye olde Submount check Date: Mon, 17 Apr 2017 22:53:50 +0100 Message-Id: <20170417215359.30641-6-chewi@gentoo.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170417215359.30641-1-chewi@gentoo.org> References: <20170417215359.30641-1-chewi@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 7c15ecf7-4da0-4f12-84f5-f12826600dcf X-Archives-Hash: a838dcfc8d09f6f4a009c86a9316b498 Submount was last-rited in 2007 and was already dead long before that. --- eclass/cdrom.eclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass index 9724c66ca2ce..681683f9328c 100644 --- a/eclass/cdrom.eclass +++ b/eclass/cdrom.eclass @@ -181,9 +181,7 @@ _cdrom_locate_file_on_cd() { while [[ -n ${cdset[${i}]} ]] ; do local point= node= fs= foo= while read point node fs foo ; do - [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \ - ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \ - && continue + [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && continue point=${point//\040/ } export CDROM_MATCH=$(_cdrom_glob_match "${point}" "${cdset[${i}]}") [[ -z ${CDROM_MATCH} ]] && continue -- 2.11.0