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 52A59138247 for ; Thu, 19 Dec 2013 07:47:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE61BE0B0C; Thu, 19 Dec 2013 07:47:41 +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 2F52BE0B0C for ; Thu, 19 Dec 2013 07:47:41 +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 5E9BC33F5F2 for ; Thu, 19 Dec 2013 07:47:40 +0000 (UTC) Message-ID: <1387439245.3897.227.camel@big_daddy.dol-sen.ca> Subject: Re: [gentoo-catalyst] [PATCH 2/2] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Date: Wed, 18 Dec 2013 23:47:25 -0800 In-Reply-To: <1387438476.3897.222.camel@big_daddy.dol-sen.ca> References: <1387328847-25840-1-git-send-email-dolsen@gentoo.org> <1387328847-25840-3-git-send-email-dolsen@gentoo.org> <20131218032857.GD25409@odin.tremily.us> <1387343884.3897.204.camel@big_daddy.dol-sen.ca> <20131218053547.GL25409@odin.tremily.us> <1387438476.3897.222.camel@big_daddy.dol-sen.ca> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-BBoovle5FfdCairMC6x9" 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: b5db7a92-20e5-417a-9e01-3a11870c03c2 X-Archives-Hash: b8f696b92a7a5943a33021d297cedd39 --=-BBoovle5FfdCairMC6x9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2013-12-18 at 23:34 -0800, Brian Dolbec wrote: > On Tue, 2013-12-17 at 21:35 -0800, W. Trevor King wrote: > > On Tue, Dec 17, 2013 at 09:18:04PM -0800, Brian Dolbec wrote: > > > On Tue, 2013-12-17 at 19:28 -0800, W. Trevor King wrote: > > > > On Tue, Dec 17, 2013 at 05:07:27PM -0800, Brian Dolbec wrote: >=20 > > > > > - self.mounts.append("/var/log/portage") > > > > > - self.mountmap["/var/log/portage"]=3Dself.settings["port_logdi= r"] > > > > > - self.env["PORT_LOGDIR"]=3D"/var/log/portage" > > > > > + self.mounts.append("port_logdir") > > > > > + self.mountmap["port_logdir"]=3Dself.settings["port_logdir"] > > > > > + self.env["PORT_LOGDIR"]=3Dself.settings["port_logdir"] > > > >=20 >=20 > > > > I also think that the PORT_LOGDIR environment variable > > > > should be: > > > >=20 > > > > self.env["PORT_LOGDIR"] =3D self.target_mounts["port_logdir"] >=20 > > I don't care about caps, I was trying to fix settings =E2=86=92 target_= mounts, > > since settings holds the mount source ;). > >=20 > > Cheers, > > Trevor > >=20 >=20 > No, this code block is adding it to the environment if defined in > settings. This patch was just removing the hard coded paths. >=20 > This is the full if block: >=20 > if "port_logdir" in self.settings: > self.mounts.append("port_logdir") > self.mountmap["port_logdir"]=3Dself.settings["port_logdir"] > self.env["PORT_LOGDIR"]=3Dself.settings["port_logdir"] > self.env["PORT_LOGDIR_CLEAN"]=3D'find "${PORT_LOGDIR}" -type f ! -name= "summary.log*" -mtime +30 -delete' >=20 > So far it is not used from the new TARGET_MOUNTS_DEFAULTS. =20 > It is so far only enabled if uncommented and defined in catalyst.conf or > from the cli. >=20 > Should I remove it from the TARGET_MOUNTS_DEFAULTS for the time being? What we could do is add a "PortageLog" to the options setting which would turn on and use the defaults unless otherwise overridden by setting the port_logdir config option. But that would be something to add later. This patch is to fix/complete the mounts, mountmap changes from the hard-coded paths and paths as keys. --=-BBoovle5FfdCairMC6x9 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) iQF8BAABCgBmBQJSsqSNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLFr8IAIe0OP7hIZqEFqtEbCaky0Dy /09J7gi8TlEmXzZhklH5Cu1iBpsEM2iRMHhZOnn7NlWMH9KetdWqDVcmnEa7UB7n thz3ERydNsuFzeRspDSmUgOVQ1aDDsG+sIVOFjdjan7OWz5a3V5m+782jZ3YduWM qmLUH0qxe+l8YFXdSUA9gLX8uHc1PehIse6DlfhWt5B9NJ3beUDuuUSZupwt/Kfu jg/wLywEEBVJ68ctnFhIZmtFNkJT2S5DV90k8SqjAY0MmGO4pp6R9x5fqPUgOPCk BV8PL5e6WOz61ZlU9jCn48T4VAgqi8eIuep699Y+nkWWQOdUP5cWs/zD3jc3VrA= =+0Ro -----END PGP SIGNATURE----- --=-BBoovle5FfdCairMC6x9--