Skip to content

Commit 2d75775

Browse files
(MODULES-11214) Wrong url generated for darwin 11
Previously, any Darwin 11 machine that used a facter version older than 4.1.1, and tried to update the puppet-agent version using the puppetlabs-puppet_agent module, would recieve a badly generated URL. This happened because the `productversion_major` fact also included the minor version.
1 parent e24a8c1 commit 2d75775

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

acceptance/tests/test_upgrade_puppet6_to_puppet7.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class { puppet_agent:
2323
package_version => $_package_version,
2424
apt_source => 'http://nightlies.puppet.com/apt',
2525
yum_source => 'http://nightlies.puppet.com/yum',
26+
mac_source => 'http://nightlies.puppet.com/downloads',
2627
windows_source => 'http://nightlies.puppet.com/downloads',
2728
collection => 'puppet7-nightly',
2829
service_names => []

manifests/osfamily/darwin.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
$source = "puppet:///pe_packages/${pe_server_version}/${::platform_tag}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
2121
}
2222
} else {
23-
$source = "${::puppet_agent::mac_source}/mac/${::puppet_agent::collection}/${::macosx_productversion_major}/${::puppet_agent::arch}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
23+
$source = "${::puppet_agent::mac_source}/mac/${::puppet_agent::collection}/${productversion_major}/${::puppet_agent::arch}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
2424
}
2525

2626
class { '::puppet_agent::prepare::package':

0 commit comments

Comments
 (0)