From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A908413827E for ; Sat, 14 Dec 2013 06:12:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0673FE0BEF; Sat, 14 Dec 2013 06:12:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C53DE0BEF for ; Sat, 14 Dec 2013 06:12:26 +0000 (UTC) Received: from [192.168.1.210] (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 4F3EC33F3CD for ; Sat, 14 Dec 2013 06:12:25 +0000 (UTC) Message-ID: <1387001532.3897.104.camel@big_daddy.dol-sen.ca> Subject: Re: [gentoo-catalyst] [PATCH 3/4] Adapt commit c52962b6bd2 to use the new configured settings values. From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Date: Fri, 13 Dec 2013 22:12:12 -0800 In-Reply-To: <52ABE5AF.7090209@gmail.com> References: <1386990436-9198-1-git-send-email-dolsen@gentoo.org> <1386990436-9198-4-git-send-email-dolsen@gentoo.org> <52ABE5AF.7090209@gmail.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-8jeBdsnGQrddJOqO8hhU" X-Mailer: Evolution 3.6.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org Mime-Version: 1.0 X-Archives-Salt: 63fec928-9b19-4e07-9d0f-2581b9211497 X-Archives-Hash: 96bfe3ba99909014b1717f0e670ad56c --=-8jeBdsnGQrddJOqO8hhU Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2013-12-13 at 22:59 -0600, Dustin C. Hatch wrote: > On 12/13/2013 21:07, Brian Dolbec wrote: > > --- > > modules/generic_stage_target.py | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/modules/generic_stage_target.py b/modules/generic_stage_ta= rget.py > > index 342c65b..1fbc733 100644 > > --- a/modules/generic_stage_target.py > > +++ b/modules/generic_stage_target.py > > @@ -1066,9 +1066,9 @@ class generic_stage_target(generic_target): > > "/use will cause portage to ignore" > > print "\tpackage.use in the profile and portage_confdir. You've = been warned!" > > > > - myf.write('PORTDIR=3D"/usr/portage"\n') > > - myf.write('DISTDIR=3D"${PORTDIR}/distfiles"\n') > > - myf.write('PKGDIR=3D"${PORTDIR}/packages"\n') > > + myf.write('PORTDIR=3D"%s"\n' % self.settings['portdir']) > > + myf.write('DISTDIR=3D"%s"\n' % self.settings['distdir']) > > + myf.write('PKGDIR=3D"%s"\n' % self.settings['packagedir']) > > > > """ Setup the portage overlay """ > > if "portage_overlay" in self.settings: > > > Do we need to still do this? Since the default location isn't hardcoded= =20 > anymore, but set in repos.conf, it can be confusing if PORTDIR is set in= =20 > make.conf, because it doesn't even get used. >=20 This patch is to fix recent commits to master that conflicted with commits done in the rewrite branch 1 year ago. All this coding was done long before the recent repos.conf changes shoved on us. There are lots more changes to come. If at that time, if things are settled, then it will be time to update for the repos.conf mess imposed on us. --=-8jeBdsnGQrddJOqO8hhU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQF8BAABCgBmBQJSq/a8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLfa0H/1TahzwlZRvrMEf6B2FmbvXh H2ZuIAasx/4MCabHmnjau7WvoDvX7uTCoUt95A4p+XDOcfMIlgyb+x5W5EE6JPYv hrcKUUiFPsOy0YGhGxiTNqphQYYakOdjbEXWkdkUWDQV4gVVG/eJBnzxc+V+hgc+ /TRYhV2gPqVJyhoUHE/eJN0/zk42PfctPGK1Tlz1zjeG7HFJclZN1wKtk4xLsXXo 9ZfkPokzZc0hGxhq1C5Akmy3jWmzq/n+AtgmqzYGW8oG8DcfCOP8+h4Qad6o5Z3e 8lOD4bCTT5RqFEMGycPfbL9gBAU2GtHiaKriTxS0Fdsk7kCNBMDWiyjbqyXGIzs= =4f4j -----END PGP SIGNATURE----- --=-8jeBdsnGQrddJOqO8hhU--