[fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs

Arthur Barton-2
Hi Ports@

Attached is an update to the new puppet 6 port, taking it to version 6.15.0

kn@ identified and fixed some bugs with the puppet 6.14 package to fix 'package ensure => latest' & 'service enabled => false', and also found some bugs with the handling of package flavors.

For the existing 6.14 package in the tree, installing a package that has flavors without specifying a flavor fails, if the flavor has a higher patch number.

I was already working on a 6.15 update so its attached here, with some further updates to the package provider.

This really needs testing as its playing with bits of the provider that I don't touch, and its a pretty brutal fix whereby the package name is set to 'packagename--' if no flavor or %branch is specified, to ensure it only matches the empty flavor.

The attached update works for throwing a few things at it
puppet resource package zabbix-proxy ensure=present flavor=sqlite3
puppet resource package screen ensure=absent
puppet resource package python%3.7 ensure=latest

but it could use more testing, especially if there are more complex package chains

Thanks,
Arthur
--
Arthur Barton
[hidden email]

puppet-6.diff (20K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs

Klemens Nanni-2
On Fri, May 22, 2020 at 04:30:53PM +1000, Arthur Barton wrote:
> Attached is an update to the new puppet 6 port, taking it to version 6.15.0
Unfortunately, your patch partially fails to apply;  did you test it
against a clean CVS checkout?

> kn@ identified and fixed some bugs with the puppet 6.14 package to fix 'package ensure => latest' & 'service enabled => false', and also found some bugs with the handling of package flavors.
>
> For the existing 6.14 package in the tree, installing a package that has flavors without specifying a flavor fails, if the flavor has a higher patch number.
Thanks, this looks like fixing it.

> I was already working on a 6.15 update so its attached here, with some further updates to the package provider.
REVISION should be removed when you update VERSION/DISTNAME.

> This really needs testing as its playing with bits of the provider that I don't touch, and its a pretty brutal fix whereby the package name is set to 'packagename--' if no flavor or %branch is specified, to ensure it only matches the empty flavor.
I think adding "--" is fine, `pkg_info -m -z' does it as well and this
is the canonical way to get a list of installed packages such that they
can be installed on another system.

Reply | Threaded
Open this post in threaded view
|

Re: [fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs

Arthur Barton-2


On Fri, May 22, 2020, at 18:38, Klemens Nanni wrote:
> On Fri, May 22, 2020 at 04:30:53PM +1000, Arthur Barton wrote:
> > Attached is an update to the new puppet 6 port, taking it to version 6.15.0
> Unfortunately, your patch partially fails to apply;  did you test it
> against a clean CVS checkout?

Attached patches nicely against a clean checkout.

> > I was already working on a 6.15 update so its attached here, with some further updates to the package provider.
> REVISION should be removed when you update VERSION/DISTNAME.

Ah okay - removed in the new diff


> > This really needs testing as its playing with bits of the provider that I don't touch, and its a pretty brutal fix whereby the package name is set to 'packagename--' if no flavor or %branch is specified, to ensure it only matches the empty flavor.
> I think adding "--" is fine, `pkg_info -m -z' does it as well and this
> is the canonical way to get a list of installed packages such that they
> can be installed on another system.


--
Arthur Barton
[hidden email]

puppet-6.15.diff (20K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [fix/update] puppet 6 update to 6.15 to fix package-with-flavor bugs

Klemens Nanni-2
On Fri, May 22, 2020 at 11:15:12PM +1000, Arthur Barton wrote:
> Attached patches nicely against a clean checkout.
It does now, thanks.

> Ah okay - removed in the new diff
It would not do any harm leaving REVISION, but since both version and
revision end up in the package's name and we're doing an update, there's
little point in going puppet-6.{14 -> 15}.0p0 - REVISION ("p0") should
be dropped for newer versions because it indicates changes during the
same version.

I committed your diff after removing another empty patch, see CVS log
for details.