[gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Michael Palimaka]

This adds proof-of-concept support for bug #282296.
Current behaviour without this change is to traceback.
---
 pym/portage/_sets/profiles.py        | 2 +-
 pym/portage/package/ebuild/config.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py
index 39a2968..48c29de 100644
--- a/pym/portage/_sets/profiles.py
+++ b/pym/portage/_sets/profiles.py
@@ -33,7 +33,7 @@ class PackagesSystemSet(PackageSet):
 			writemsg_level("\nPackagesSystemSet: profile paths: %s\n" % \
 				(self._profile_paths,), level=logging.DEBUG, noiselevel=-1)
 
-		mylist = [grabfile_package(os.path.join(x, "packages"), verify_eapi=True) for x in self._profile_paths]
+		mylist = [grabfile_package(os.path.join(x, "packages"), recursive=True, verify_eapi=True) for x in self._profile_paths]
 
 		if debug:
 			writemsg_level("\nPackagesSystemSet: raw packages: %s\n" % \
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index e104501..e294968 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -557,7 +557,7 @@ class config(object):
 			self.user_profile_dir = locations_manager.user_profile_dir
 
 			packages_list = [grabfile_package(os.path.join(x, "packages"),
-				verify_eapi=True) for x in self.profiles]
+				recursive=True, verify_eapi=True) for x in self.profiles]
 			self.packages = tuple(stack_lists(packages_list, incremental=1))
 
 			# revmaskdict
-- 
1.8.5.5

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Thanks! Committed as b4d8e300c04b768be7cd5c64116d6cc0453219b4.

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlNwnxsACgkQRtClrXBQc7XBngD6A6FkUivoQAtXUaVOVLu+aLzX
nUI7vZQOA4CvGIW5qK4BAIRvWMC3PQM1VrdoWDjR7Hh+euhCrRDn9RyG+JgEfkOz
=LhmL
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Alec Warner]

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

And the manpages..?

-A


On Mon, May 12, 2014 at 3:14 AM, Alexander Berntsen <bernalex@gentoo.org>wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Thanks! Committed as b4d8e300c04b768be7cd5c64116d6cc0453219b4.
>
> - --
> Alexander
> bernalex@gentoo.org
> https://secure.plaimi.net/~alexander
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.22 (GNU/Linux)
> Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
>
> iF4EAREIAAYFAlNwnxsACgkQRtClrXBQc7XBngD6A6FkUivoQAtXUaVOVLu+aLzX
> nUI7vZQOA4CvGIW5qK4BAIRvWMC3PQM1VrdoWDjR7Hh+euhCrRDn9RyG+JgEfkOz
> =LhmL
> -----END PGP SIGNATURE-----
>
>

[-- Attachment #2: Type: text/html, Size: 1165 bytes --]

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Sebastian Luther]

Am 12.05.2014 12:14, schrieb Alexander Berntsen:
> Thanks! Committed as b4d8e300c04b768be7cd5c64116d6cc0453219b4.
> 
> 
> 

This change requires a new profile format (you'd want to call it
portage-3 probably). The change then needs to depend on it.



- Sebastian

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Brian Dolbec]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On Mon, 12 May 2014 12:14:51 +0200
Alexander Berntsen <bernalex@gentoo.org> wrote:

> 
> Thanks! Committed as b4d8e300c04b768be7cd5c64116d6cc0453219b4.
> 
> - -- 
> Alexander
> bernalex@gentoo.org

Did you look at the bug mentioned?  It is an EAPI-6 proposal, which
when you look at the PMS patch... it also mentions that catalyst is
not capable of packages.build as a directory.  So it needs to be
modified to support packages.build as a directory in order for it to
continue building stages.

But the real clue that more would be needed besides those 2 simple line
changes..

quoting the original email/patch:

This adds proof-of-concept support for bug #282296.


NOTE the words "proof-of-concept"

- -- 
Brian Dolbec <dolsen>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQF8BAEBCgBmBQJTcRa9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLl1AH/0V+JsovpplQy+k1dqR1RJ+y
n12DCldvs/zmfqrwWap5s12Vwk5moWwO474bWDA9Tl6DpZ7eWUDDFHpb/Dqhm5rF
ZhGkxgcypA3eeZDxDIYXxGF/HmZWZ32etdsFbBWlGvvLTPzYrCuR/lhr74Ud8UlU
KtfqYk4XDWUdqB+TDmW86SfcGTpt70tKSsK4LjmJN8TPUjiw4RFuVCaQ04BtRM8M
T+6Xx/MIfEvbiGPA4ldGUV/v8iw1BTXR7BqaWz5yON1oCR3dmEIgjlX1+H92u0if
yUzyLlJ2myEOCvDMOUUvBfkbo3Y9wQgzqfgHzFS0rrXhsZUWPsF4BBXEod+IXvY=
=LZY0
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 12/05/14 20:45, Brian Dolbec wrote:
> Did you look at the bug mentioned?  It is an EAPI-6 proposal,
> which when you look at the PMS patch... it also mentions that
> catalyst is not capable of packages.build as a directory.  So it
> needs to be modified to support packages.build as a directory in
> order for it to continue building stages.
The patch fixes a more immediate problem. Per the Portage man page,
any file in /etc/portage/make.profile/ can be a directory. Without
this patch, Portage crashes.
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlNxJHsACgkQRtClrXBQc7XoDwD+LLIBVW3uErUXtuk95AuzNsvh
hAM+cAvZM/uELi7G9TsA/A5qKWWj76hO6bUTt3aFt61uQ1uIV/FIo0XUazfDV06n
=9z//
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Sebastian Luther]

Am 12.05.2014 21:43, schrieb Alexander Berntsen:
> The patch fixes a more immediate problem. Per the Portage man
> page, any file in /etc/portage/make.profile/ can be a directory.
> Without this patch, Portage crashes.
> 
> 
Please cite the part of the man page that says this. I only see (in
man portage): 'Any file in this directory [...] that begins with
"package." or "use." can be more than just a flat file.'

The "packages" file does not start with "package.".

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 12/05/14 22:06, Sebastian Luther wrote:
> Please cite the part of the man page that says this. I only see
> (in man portage): 'Any file in this directory [...] that begins
> with "package." or "use." can be more than just a flat file.'
> 
> The "packages" file does not start with "package.".
I read '.' to mean wildcard, sorry. Do you want me to revert the
commit or amend the man page?
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlNxMXcACgkQRtClrXBQc7Vu/AEAiaRAipvXi/3knXS2olA7fQWl
4aem4GyDWTjgig9lO4EA/2OwyxCEXdYFJjXjrv5XYnqQH63sK//M4/eTDy/Kcj5v
=z5eL
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Brian Dolbec]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On Mon, 12 May 2014 22:39:19 +0200
Alexander Berntsen <bernalex@gentoo.org> wrote:

> On 12/05/14 22:06, Sebastian Luther wrote:
> > Please cite the part of the man page that says this. I only see
> > (in man portage): 'Any file in this directory [...] that begins
> > with "package." or "use." can be more than just a flat file.'
> > 
> > The "packages" file does not start with "package.".
> I read '.' to mean wildcard, sorry. Do you want me to revert the
> commit or amend the man page?
> - -- 
> Alexander
> bernalex@gentoo.org


Well, that is debatable, but, it's been reported as being in portage on
that eapi bug now.  So at the very least you need to wrap it in
something that checks eapi or the portage-3 format, Something that is
not yet clear to me which.  And instead of tracebacking like it did,
have it error out instead.

In the short term it likely won't hurt (we may need to dis-able it for
a new release) and will allow them to do more testing, to establish the
official parameters of the new feature.

FIX IT!

- -- 
Brian Dolbec <dolsen>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQF8BAEBCgBmBQJTcTo+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLbAMH/jTVSmpSiNHyuGjzpwQy2P69
qM5jr7ggOhX3Kgsk175hpAylHRDXJlt6w0cFhnxAccQdUTaeZZpFOdO2+AYLlszk
to442cEyzDdXdgVkaGC6X2w9Z7AbLIWUeWUHP6/RcPxLWdgS6TXb2efD7tsINr7T
vXoWZnimlVMIi5GXQh8lPCDSZ/TSNhiWmqA8+524uj4LtQKuCamaF9FsiaJRLWxi
Ri9LhVSNJi41SB5UsfqHJKB4n4MOtELkT1GpbYXb5QeNM3JMDZevV8G1gwr1sOnU
Fkgn/wWDxhvIxZbfZ13tZkRKJcl4bYc37QvjO1rUIAtdNodqj3AFplRm0OPGIxw=
=ileR
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 12/05/14 23:16, Brian Dolbec wrote:
> Well, that is debatable, but, it's been reported as being in
> portage on that eapi bug now.  So at the very least you need to
> wrap it in something that checks eapi or the portage-3 format,
> Something that is not yet clear to me which.  And instead of
> tracebacking like it did, have it error out instead.
I'll look into it soon.

> FIX IT!
I'm not convinced screaming at volunteers is a good motivational strategy.
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlNxPBgACgkQRtClrXBQc7XNhgEAi8L45Kk1Elvm31GH4HYL/LkD
H8AAbmW/GY8hDoTweuoBAKL6iv0dw9/S4pu+CrS2P5w/vTK/2m78x3/cadRLnQsU
=J+GM
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.

[Brian Dolbec]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On Mon, 12 May 2014 23:24:40 +0200
Alexander Berntsen <bernalex@gentoo.org> wrote:

> > FIX IT!
> I'm not convinced screaming at volunteers is a good motivational
> strategy.


I didn't mean it as a scream, just emphasis.  I've been feeling a little
Gibbs'ish today :)

http://www.youtube.com/watch?v=4nXtcNnC3wY

- -- 
Brian Dolbec <dolsen>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQF8BAEBCgBmBQJTcUFxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfL4gsH/09SZXkmQU3EWJUJIy9glVu1
1ZDTUZfF8yA2TaSUN+1ctf0crSsk5xVsfJ/3E2suaHRh+xCxzf6hz+++AN60afaF
HFEUf4XdY1B9odOtEdBBiI6ztwq42JSOJ1LUZ9Yu+wezz1u8k1tXyX3O18AclmVg
caaqjZouGsnc0m3Bwja6RT36IAIoZTgVvB88y+5n0tU+h+4VuS0itZ3vVpc/+YwD
LGSbj2VzeB0CLVIx/48T5dCi3UL8mxvuqCzQWo5rb/UjXC2QP6yG25jJtE7yNJJX
HWBk3pFMNAQg3ztuEJldkVGLxNuvdfhCQRXOT8SxX1Rip0llt1Ur20Hxup5JLTU=
=KTgd
-----END PGP SIGNATURE-----