Re: [gentoo-catalyst] Re: [PATCH 2/2] Move from PORTDIR_OVERLAY to repos.conf

[Brian Dolbec]

On Fri, 30 Oct 2020 12:07:56 -0400
Matt Turner <mattst88@g.o> wrote:

> On Sun, Oct 18, 2020 at 11:15 AM Felix Bier
> <Felix.Bier@×××××××××××××.com> wrote:
> >
> > This commit fixes the following issues:
> >
> >   * The PORTDIR_OVERLAY variable has been deprecated by Gentoo.
> >
> >     With this commit, the variable is no longer written to the
> >     generated make.conf. Instead, a config file
> >     /etc/portage/repos.conf/<repo-name>.conf
> >     is generated for each overlay. The repo name is read from the
> >     overlay using the portage API. Internally, portage parses
> >     metadata/layout.conf and profiles/repo_name to obtain the name.
> >
> >     References:
> >     https://wiki.gentoo.org/wiki//etc/portage/make.conf
> >     https://wiki.gentoo.org/wiki//etc/portage/repos.conf
> >
> >   * All overlays were copied into the same target directory. If the
> >     same file name occurred in multiple overlays, the last overlay
> >     would overwrite all previous files with this name. In
> > particular, only the metadata/layout.conf of the last overlay was
> > retained, so it was not possible to reference the other overlays
> > e.g. via the masters entry in the layout.conf or the portage-2
> > syntax for specifying a parent profile from another overlay. Also,
> >     this created problems when the overlays contained ebuilds
> >     for the same package, but with differing versions, because
> >     after copying, the target directory contained both versions of
> > the ebuild but only the manifest file of the last overlay.
> >
> >     With this commit, each overlay is copied into a separate
> >     sub-directory, e.g. /var/gentoo/repos/local/<repo-name>/.
>
> I see this /var/gentoo/repos path used as an example in a few places
> but not actually in any code. I think our example should match the
> default structure these days, e.g., /var/db/repos/<repo-name>.
>
> >     This directory is referenced via the location entry in the
> >     generated /etc/portage/repos.conf/<repo-name>.conf.
> > ---
> >  catalyst/base/stagebase.py | 72
> > ++++++++++++++++++++++++++++---------- catalyst/defaults.py       |
> > +
> > +    def get_overlay_location(self, repo_name):
> > +        """ Construct overlay repo path:
> > /var/gentoo/repos/local/{name} """
> > +        return
> > normpath(os.path.join(self.settings['local_overlay'], repo_name)) +
> > +    def write_repo_conf(self, repo_name, config):
> > +        """ Write ConfigParser to
> > {chroot}/etc/portage/repo.conf/{name}.conf """
> > +        repo_conf = self.get_repo_conf_path(repo_name)
> > +        chroot_repo_conf = self.settings['chroot_path'] + repo_conf
> > +        log.info('Creating repo config %s.', chroot_repo_conf)
> > +        ensure_dirs(os.path.dirname(chroot_repo_conf))
>
> Same thing: I'd rather use pathlib and use Path.mkdir and not add new
> uses of ensure_dirs.
>
> > +
> > +        try:
> > +            with open(chroot_repo_conf, 'w') as myf:
>
> Let's rename myf. The 'my' prefix pattern in catalyst is not a good
> one. Even just 'f' or 'file' would be better, IMO.
>

file is a python reserved word, use _file or some other variant to not
re-assign the python file definition.