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 3423F138247 for ; Sat, 14 Dec 2013 18:05:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 104FDE09C2; Sat, 14 Dec 2013 18:05:46 +0000 (UTC) Received: from qmta09.westchester.pa.mail.comcast.net (qmta09.westchester.pa.mail.comcast.net [76.96.62.96]) by pigeon.gentoo.org (Postfix) with ESMTP id 7567BE09C2 for ; Sat, 14 Dec 2013 18:05:45 +0000 (UTC) Received: from omta02.westchester.pa.mail.comcast.net ([76.96.62.19]) by qmta09.westchester.pa.mail.comcast.net with comcast id 1VtQ1n0010QuhwU59W5kbg; Sat, 14 Dec 2013 18:05:44 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta02.westchester.pa.mail.comcast.net with comcast id 1W5j1n00M152l3L3NW5jPm; Sat, 14 Dec 2013 18:05:44 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id C23F5D6831B; Sat, 14 Dec 2013 10:05:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387044342; bh=KI3iOkToAzm/gT6OgHKFbrnsFlVZM05tRWh6H6I/8Ok=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=gnj5aw0YGZ5jEDarqvMo5B1vJU2wIUm5FKTm1en3a8WMhAFwkkZy+ma1XAi+BLjFR sncyvyHl8uGdL1zIUfoE0QTI80CTclVlSMZNJnpuZ6BIH55jB8F7AIB5+F6mllcvfo 3GT3aQVdX6JcOPBZjpUlpFggRDvlthqD2PvwQ29s= Date: Sat, 14 Dec 2013 10:05:42 -0800 From: "W. Trevor King" To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: Re: [gentoo-catalyst] [PATCH 2/4] Remove self.mounts and self.mountmap's use of paths for keys and paths. Message-ID: <20131214180542.GA25409@odin.tremily.us> References: <1386990436-9198-1-git-send-email-dolsen@gentoo.org> <1386990436-9198-3-git-send-email-dolsen@gentoo.org> <1387019742.3897.121.camel@big_daddy.dol-sen.ca> <20131214163714.GY25409@odin.tremily.us> 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 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="XilfshMFnlxBucLf" Content-Disposition: inline In-Reply-To: <20131214163714.GY25409@odin.tremily.us> OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8; url=http://tremily.us/pubkey.txt User-Agent: Mutt/1.5.22 (2013-10-16) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387044344; bh=7AkmHl4BeG4W8779IXZlVr6gC4F/luBkFzA2o+msnyo=; h=Received:Received:Received:Date:From:To:Subject:Message-ID: MIME-Version:Content-Type; b=QJ2ClxosTf1AiRobN+/4KNZHUSRZSniSAsBY7tImmCWtBdPDTfEV3PVkqM+weiqIU HAI8Z67aIOG1ifIqU1Gogn3jzVL7+aXF1zPaa7t8Bfwfp3Jdo0pRtmgM8pSd4VQziG jIk+Jmxg8AIEl6PH+y42I8tqODAQsvHQq7oP7XZiQ1YaUUVXZasMliVOvQ9VYgoKlO 6fyIDTztPTzI1JDDgqRpraKzeedYfxzBWoMW5sdQeMWnI/EC0T7gPMtcCBp1+C+ELm QSKb1waJWpO8HxYRBhPikPxjfg/7UpqqM63rIOqIlFSjnrBFtRdF0Idzy/xE4QY+3e MA7IwqH5RrogQ== X-Archives-Salt: 63dc1a33-ae79-4dac-829d-6b4491915cae X-Archives-Hash: 90a504d223e724a347917a71d25b27ec --XilfshMFnlxBucLf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 14, 2013 at 08:37:14AM -0800, W. Trevor King wrote: > On Sat, Dec 14, 2013 at 03:15:42AM -0800, Brian Dolbec wrote: > > On Fri, 2013-12-13 at 21:08 -0800, Matt Turner wrote: > > > and it'd be preferable to do one path per patch. > >=20 > > Re-coding that mounts and mountmap mess was hard enough and > > required lots of testing, fixing to get it correct and working. > > Splitting it up even more is an exercise in > > I'm playing around with this now ;). We'll see if I can get the > commits reshuffled and preserve the same tree hash as Brian's > a1f054e [1]. Ok, I've refactored the Git history up to a1f054e. Here's the diff vs. a1f054e: $ git diff a1f054e..wking/dolsen-rewrite-part-1 diff --git a/catalyst b/catalyst index a68a2ba..ebda844 100755 --- a/catalyst +++ b/catalyst @@ -66,11 +66,12 @@ def parse_config(myconfig): confdefaults=3D{ "distdir": "/usr/portage/distfiles", "hash_function": "crc32", + "options": "", "packagedir": "/usr/portage/packages", "portdir": "/usr/portage", "port_tmpdir": "/var/tmp/portage", "repo_name": "portage", - "sharedir": "/usr/lib/catalyst", + "sharedir": "/usr/share/catalyst", "snapshot_name": "portage-", "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", "storedir": "/var/tmp/catalyst", diff --git a/modules/generic_stage_target.py b/modules/generic_stage_targ= et.py index 1fbc733..800ddfa 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -179,11 +179,11 @@ class generic_stage_target(generic_target): "/usr/portage":self.settings["snapshot_ca= che_path"]+"/portage",\ "/usr/portage/distfiles":self.settings["d= istdir"],"/var/tmp/portage":"tmpfs"} else: - self.mounts=3D["proc","dev", "distdir", "port_tmp= dir"] - self.mountmap=3D{"proc":"/proc", "dev":"/dev", "p= ts":"/dev/pts", + self.mounts=3D["proc", "dev", "distdir", "port_tm= pdir"] + self.mountmap=3D{"proc":"/proc", "dev":"/dev", "d= evpts":"/dev/pts", "distdir":self.settings["distdir"], "port= _tmpdir":"tmpfs"} if os.uname()[0] =3D=3D "Linux": - self.mounts.append("pts") + self.mounts.append("devpts") self.set_mounts() diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py index 29d6e87..9e65c24 100644 --- a/modules/snapshot_target.py +++ b/modules/snapshot_target.py @@ -54,7 +54,7 @@ class snapshot_target(generic_stage_target): print "Compressing Portage snapshot tarball..." cmd("tar -I lbzip2 -cf " + self.settings["snapshot_path"]= + " -C " + - mytmp + " %s" % self.settings["repo_name"], + mytmp + " " + self.settings["repo_name"], "Snapshot creation failure",env=3Dself.env) self.gen_contents_file(self.settings["snapshot_path"]) And here's the request-pull: $ git request-pull origin/master wking wking/dolsen-rewrite-part-1 The following changes since commit 1c86c64113491885b159529dacb452ce6a3e5f= 4b: catalyst 2.0.15 (2013-11-13 13:59:25 -0800) are available in the git repository at: git://tremily.us/catalyst.git dolsen-rewrite-part-1 for you to fetch changes up to 907c35fb1e1cae75cc78d45b054c3c43ac9deb48: cleanup long lines, improve usage() output formatting slightly (2013-12= -14 09:48:22 -0800) ---------------------------------------------------------------- Brian Dolbec (20): modules/tinderbox_target.py: Use 'portdir' instead of hard-coding '= /usr/portage' modules/generic_stage_target.py: Use 'portdir' instead of hard-codi= ng '/usr/portage' modules/generic_stage_target.py: Use 'portdir' instead of hard-codi= ng '/usr/portage' modules/generic_stage_target.py: Use 'distdir' instead of hard-codi= ng '${PORTAGE}/distfiles' modules/generic_stage_target.py: Use a 'local_overlay' setting inst= ead of hard-coding '/usr/local/portage' catalyst: Split confdefaults into line-per-entry catalyst: Add 'repo_name' default catalyst: Add 'snapshot_name' default catalyst: Add 'packagedir' default instead of hard-coding '/usr/por= tage/packages' catalyst: Add 'port_tmpdir' default instead of hard-coding '/var/tm= p/portage' modules/generic_stage_target.py: Don't use paths as mountmap keys modules/generic_stage_target.py: Use 'proc' instead of '/proc' as t= he mountmap key modules/generic_stage_target.py: Use 'dev' instead of '/dev' as the= mountmap key modules/generic_stage_target.py: Use 'distdir' instead of '/usr/por= tage/distfiles' as the mountmap key modules/generic_stage_target.py: Use 'port_tmpdir' instead of '/var= /tmp/portage' as the mountmap key modules/generic_stage_target.py: Use 'devpts' instead of '/dev/pts'= as the mountmap key modules/generic_stage_target.py: Use 'packagedir' instead of '/usr/= portage/packages' as the mountmap key modules/generic_stage_target.py: Use 'kerncache' instead of '/tmp/k= erncache' as the mountmap key modules/generic_stage_target.py: Use 'ccache' instead of '/var/tmp/= ccache' as the mountmap key cleanup long lines, improve usage() output formatting slightly catalyst | 101 ++++++++++++++++++++++++----------= ------ modules/generic_stage_target.py | 92 ++++++++++++++++++----------------= -- modules/snapshot_target.py | 14 ++++-- modules/tinderbox_target.py | 4 +- 4 files changed, 119 insertions(+), 92 deletions(-) I can submit them to the list via `git send-email` if you'd like, just let me know. Cheers, Trevor --=20 This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy --XilfshMFnlxBucLf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJSrJ30AAoJEKKfehoaNkbty6AQAJ9tiunWfZxPTjtFMUgLdTD4 CuZWDyzwhzqN3e7BpiRi544sxoEKCbs+pBHauxOwLu0v5q/CZAoCWHqcFnGKf21f Fho2xT//kNyIHLAREBYch/M/XopsJyqKS0jpr3GDOuizilTe7hfyVaFnNzIj6I7s eqVu+KVRsaBfg32+ceQYX+1x3M4aTrnadZgcb+IRQo9DMAHxbZ1xrblTdkF2+czg hyuCcG0e6uWtLoFv9iSYJMbSGqMjwLCi8rEjeMkNVAiaerz7UJT1IlAhRdr6jmT8 Fnrzv0iDOARXlPZxJvgRBgisptsAic8tYB64QOBemOZC2EC2j2XwwfJUqdxDjlIs ngTD2Z4bp33pZikzXJ9uxc3NxksqPa2z8oKWV0iRI8cuWdvhCtdjkMybgTd3gpvt xRYopmVfR4L85dPeCLzq4BRquLeo7gVQ4b5Q1LmXSCEAuyWT5TCedZAbj/+4ynOD QMPV5uWPWQD17KmJ420vVYK9zJeKEaGoGq+8utv9t/ApTlCvllH9KJmVTXFxq/Di Q1Z0jkuYo00+iGEI9NugxaSvj9J8Vemeq9s6IKzClh1Kq+Kbtb0m09DT8CBrta20 OtZLsCl83TsZPWiQKQK6B/4gFr+uskH94GwaynRBzuH/fg9gpH5j7cy5RXlkmHHQ 8wGeM4AtRYlH114Ft9LW =V1o4 -----END PGP SIGNATURE----- --XilfshMFnlxBucLf--