Re: [gentoo-catalyst] [PATCH 2/4] Remove self.mounts and self.mountmap's use of paths for keys and paths.

["W. Trevor King" <wking@tremily.us>]

[-- Attachment #1: Type: text/plain, Size: 6325 bytes --]

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.
> > 
> > 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={
                  "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_target.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_cache_path"]+"/portage",\
                                  "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
                  else:
  -                       self.mounts=["proc","dev", "distdir", "port_tmpdir"]
  -                       self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts",
  +                       self.mounts=["proc", "dev", "distdir", "port_tmpdir"]
  +                       self.mountmap={"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts",
                                  "distdir":self.settings["distdir"], "port_tmpdir":"tmpfs"}
                  if os.uname()[0] == "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=self.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 1c86c64113491885b159529dacb452ce6a3e5f4b:

    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-coding '/usr/portage'
        modules/generic_stage_target.py: Use 'portdir' instead of hard-coding '/usr/portage'
        modules/generic_stage_target.py: Use 'distdir' instead of hard-coding '${PORTAGE}/distfiles'
        modules/generic_stage_target.py: Use a 'local_overlay' setting instead 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/portage/packages'
        catalyst: Add 'port_tmpdir' default instead of hard-coding '/var/tmp/portage'
        modules/generic_stage_target.py: Don't use paths as mountmap keys
        modules/generic_stage_target.py: Use 'proc' instead of '/proc' as the 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/portage/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/kerncache' 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

-- 
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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]