Skip to content

Commit 1fab096

Browse files
committed
modulesync 2.10.1
1 parent 01ea9c7 commit 1fab096

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.10.0'
1+
modulesync_config_version: '2.10.1'

spec/spec_helper.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,14 @@
4848
# Otherwise we need to match the correct facter version to the used puppet version.
4949
# as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
5050
# https://puppet.com/docs/puppet/5.5/about_agent.html
51+
#
52+
# The environment variable `PUPPET_VERSION` is available in our travis environment, but we cannot rely on it
53+
# if somebody runs the tests locally. For that case we should fallback the the puppet gem version.
5154
c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
5255
ENV['FACTERDB_FACTS_VERSION']
5356
else
54-
Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
57+
puppet_version = ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : Gem.loaded_specs['puppet'].version.to_s
58+
Gem::Dependency.new('', puppet_version).match?('', '5') ? '3.11.0' : '3.14.0'
5559
end
5660

5761
# Coverage generation

0 commit comments

Comments
 (0)