HomeSoftware Heritage

Debian 11: fix typo in `versioncmp()` / set default php to 7.4

Description

Debian 11: fix typo in versioncmp() / set default php to 7.4

tl;dr $::operatingsystemrelease is different from
$::operatingsystemmajrelease. $::operatingsystemmajrelease returns
'11.0' on Debian 11, whereas $::operatingsystemmajrelease is 11.
In addition versioncmp() says that '11.0' is greater than 11.

Without this change, the module sets the default PHP version on Debian
11 to 7.2, but the actual default in Debian is 7.4:

The 7.2 currently comes from the default entry in the selector
statement:

To test:

puppet
notify { "operatingsystemrelease compared to 11: ${versioncmp($::operatingsystemrelease, '11')}":}
notify { "operatingsystemmajrelease compared to 11: ${versioncmp($::operatingsystemmajrelease, '11')}":}
notify { "operatingsystemrelease: ${::operatingsystemrelease}":}
notify { "operatingsystemmajrelease: ${::operatingsystemmajrelease}":}

which produces:

terminal
puppet apply test.pp
Notice: Compiled catalog for blal in environment production in 0.02 seconds
Notice: operatingsystemrelease compared to 11: 1
Notice: /Stage[main]/Main/Notify[operatingsystemrelease compared to 11: 1]/message: defined 'message' as 'operatingsystemrelease compared to 11: 1'
Notice: operatingsystemmajrelease compared to 11: 0
Notice: /Stage[main]/Main/Notify[operatingsystemmajrelease compared to 11: 0]/message: defined 'message' as 'operatingsystemmajrelease compared to 11: 0'
Notice: operatingsystemrelease: 11.0
Notice: /Stage[main]/Main/Notify[operatingsystemrelease: 11.0]/message: defined 'message' as 'operatingsystemrelease: 11.0'
Notice: operatingsystemmajrelease: 11.0
Notice: /Stage[main]/Main/Notify[operatingsystemmajrelease: 11.0]/message: defined 'message' as 'operatingsystemmajrelease: 11'
Notice: Applied catalog in 0.01 seconds
terminal
:~> facter operatingsystemmajrelease
11
:~> facter operatingsystemrelease
11.0

The spec tests are copied from
https://github.com/puppetlabs/puppetlabs-apache/pull/2181
Co-authored-by: Kienan Stewart <kienan.stewart@burntworld.ca>

Details

Provenance
Tim Meusel <tim@bastelfreak.de>Authored on Sep 1 2021, 12:50 PM
GitHub <noreply@github.com>Committed on Sep 1 2021, 12:50 PM
olasdPushed on Dec 28 2021, 10:47 AM
Parents
rSPAPA3fff7d86c44f: Merge pull request #2185 from puppetlabs/release-prep
Branches
Unknown
Tags
Unknown

Event Timeline