From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q384W-0000wN-A7 for garchives@archives.gentoo.org; Fri, 25 Mar 2011 14:33:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6E761C05C; Fri, 25 Mar 2011 14:32:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7C72A1C04D for ; Fri, 25 Mar 2011 14:29:34 +0000 (UTC) Received: from gentoo.org (174-25-229-142.rstr.qwest.net [174.25.229.142]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: dberkholz) by smtp.gentoo.org (Postfix) with ESMTPSA id 549FF1B4066 for ; Fri, 25 Mar 2011 14:29:33 +0000 (UTC) Date: Fri, 25 Mar 2011 09:29:30 -0500 From: Donnie Berkholz To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] mono.eclass EAPI3(/4) Message-ID: <20110325142929.GA4324@comet> References: <1301006923.28822.4.camel@dauntless> 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 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="x+6KMIRAuhnl3hBn" Content-Disposition: inline In-Reply-To: <1301006923.28822.4.camel@dauntless> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: X-Archives-Hash: 41a1b219fb1e93d60c94d000ed033f83 --x+6KMIRAuhnl3hBn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 23:48 Thu 24 Mar , Christoph Mende wrote: > Index: mono.eclass > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v > retrieving revision 1.13 > diff -u -b -B -r1.13 mono.eclass > --- mono.eclass 8 Mar 2009 15:46:54 -0000 1.13 > +++ mono.eclass 24 Mar 2011 22:47:08 -0000 > @@ -35,24 +35,26 @@ > unset MONO_AOT_CACHE > =20 > egacinstall() { > + [[ -z ${ED+set} ]] && local ED=3D${D%/}${EPREFIX}/ > gacutil -i "${1}" \ > - -root "${D}"/usr/$(get_libdir) \ > + -root "${ED}"/usr/$(get_libdir) \ > -gacdir /usr/$(get_libdir) \ > -package ${2:-${GACPN:-${PN}}} \ > || die "installing ${1} into the Global Assembly Cache failed" > } > =20 > mono_multilib_comply() { > + [[ -z ${ED+set} ]] && local ED=3D${D%/}${EPREFIX}/ > local dir finddirs=3D() mv_command=3D${mv_command:-mv} > - if [[ -d "${D}/usr/lib" && "$(get_libdir)" !=3D "lib" ]] > + if [[ -d "${ED}/usr/lib" && "$(get_libdir)" !=3D "lib" ]] No need for quotes when expanding variables or functions inside [[ ]].=20 That holds true for the rest of the diff, too. I'd also split this (and=20 a later find call) into two separate conditionals, with just one test=20 per [[ ]]. --=20 Thanks, Donnie Donnie Berkholz Sr. Developer, Gentoo Linux Blog: http://dberkholz.com --x+6KMIRAuhnl3hBn Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEABECAAYFAk2MpskACgkQXVaO67S1rtucVwCg6Ip8j8BbrpYy0qsb5nLD1wFO V64AoLmy3KCNSKUq6OuM1yfihlHPOJXH =FcqC -----END PGP SIGNATURE----- --x+6KMIRAuhnl3hBn--