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 476E713827E for ; Sat, 14 Dec 2013 11:54:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF994E0AEE; Sat, 14 Dec 2013 11:54:43 +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 6A8D7E0AEE for ; Sat, 14 Dec 2013 11:54:43 +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 9DF9033EDF8 for ; Sat, 14 Dec 2013 11:54:42 +0000 (UTC) Message-ID: <1387022071.3897.141.camel@big_daddy.dol-sen.ca> Subject: Re: [gentoo-catalyst] [PATCH 1/4] Add more configured defaults From: Brian Dolbec To: "gentoo-catalyst@lists.gentoo.org" Date: Sat, 14 Dec 2013 03:54:31 -0800 In-Reply-To: References: <1386990436-9198-1-git-send-email-dolsen@gentoo.org> <1386990436-9198-2-git-send-email-dolsen@gentoo.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-2pE0Txjml00ll5fuAOYP" 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: c595dade-0a65-4864-a51e-8c6bb24c3423 X-Archives-Hash: 4f57591125f39c7fafef386c81ac7c6f --=-2pE0Txjml00ll5fuAOYP Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2013-12-13 at 20:51 -0800, Matt Turner wrote: > On Fri, Dec 13, 2013 at 7:07 PM, Brian Dolbec wrote: > > Use the new configured snapshot_name and portdir settings > > Use the portdir setting rather than hard-coded path > > --- > > catalyst | 14 +++++++++----- > > modules/generic_stage_target.py | 6 ++++-- > > modules/snapshot_target.py | 14 +++++++++----- > > modules/tinderbox_target.py | 4 ++-- > > 4 files changed, 24 insertions(+), 14 deletions(-) > > > > diff --git a/catalyst b/catalyst > > index ba26f3c..19ec77e 100755 > > --- a/catalyst > > +++ b/catalyst > > @@ -61,11 +61,15 @@ def parse_config(myconfig): > > myconf=3D{} > > config_file=3D"" > > > > - confdefaults=3D{ "storedir":"/var/tmp/catalyst",\ > > - "sharedir":"/usr/share/catalyst","distdir":"/usr/portag= e/distfiles",\ > > - "portdir":"/usr/portage","options":"",\ > > - "snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\ > > - "hash_function":"crc32"} > > + confdefaults=3D{ > > + "hash_function": "crc32", > > + "portdir": "/usr/portage", > > + "repo_name": "portage", > > + "sharedir": "/usr/lib/catalyst", > > + "snapshot_name": "portage-", > > + "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", > > + "storedir": "/var/tmp/catalyst", > > + } >=20 > I agree that adding a key:value to store "portage-" seems unnecessary. > I don't think we should do this unless someone has a compelling > reason. >=20 Reasons for the change: 1) it is bad design to have things hard-coded in many places throughout the code. 2) this makes it one easy to edit and central place to change it. 3) I feel the name is incorrect and I intend to lobby for it to be changed during the tree move from /usr/portage to the new location somewhere in /var (bikeshedding likely to continue on the final location once catalyst is actually capable of producing stages with and for the moved tree. Which is _the_ reason I got started coding on catalyst in the first place.). I regard portage as the name of the package manager and not the tree, the repo_name is "gentoo", not "portage". Plus it is likely to be less confusing for noobs first installing gentoo that get confused between portage the package manager and portage the tree. P.S. plus you didn't have to code it. It has been done for you ;) > Also, we lost "options" here. Is this intentional or consequential? >=20 likely another rebase error. I did revamp the options system which had duplications all through the code. But I don't believe that should be showing up here. > > -- > > 1.8.3.2 > > > > --=-2pE0Txjml00ll5fuAOYP 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) iQF8BAABCgBmBQJSrEb3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLGLgH/ipPDFngk59UEvYtq+ljIPVy W6UI2K4b2A4y7FVEaP8Jnz/xQtP/evDz+9/xzOwlDRsd6M8zNU+a25ThNeiokp+F c9Qeh64PWvNTVFQqdBl0ZnpQN6vuY3LYICYBeE6RGJ/fdkbSkWGhc1i7IvYRamOO xD5SSt2VWWuZH/AY7xA3vPDjJUZHJETiSeAt+q5uj7xGBDOcwPsHtaha1AEEAy+K 4+a6azX25pBrb8uGls8mqKWMjkYEvni3vimZpUfgpH2NI8aou8e28wk1tk2N2kG8 7wAkcuP+7hDOJRl0WJkdtdG0u7Hydq2BWCyW7SvqOU05Mx99BS8hPQ65jN1mSbU= =ka0b -----END PGP SIGNATURE----- --=-2pE0Txjml00ll5fuAOYP--