Skip to content

Commit f8f6d15

Browse files
committed
Merge pull request voxpupuli#142 from eshamow/fix_accidental_deprecation
Add fix to detect older puppet while setting allow_virtual for > 3.6
2 parents 2fb01de + 28f30eb commit f8f6d15

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

lib/facter/pip_version.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Make pip version available as a fact
22
# Works with pip loaded and without, pip installed using pip and package installed
33
require 'puppet'
4-
pkg = Puppet::Type.type(:package).new(:name => "python-pip")
4+
if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
5+
pkg = Puppet::Type.type(:package).new(:name => 'python-pip', :allow_virtual => 'false')
6+
else
7+
pkg = Puppet::Type.type(:package).new(:name => 'python-pip')
8+
end
59
Facter.add("pip_version") do
610
has_weight 100
711
setcode do

lib/facter/python_version.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Make python versions available as facts
22
# In lists default python and system python versions
33
require 'puppet'
4-
pkg = Puppet::Type.type(:package).new(:name => "python")
5-
4+
if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
5+
pkg = Puppet::Type.type(:package).new(:name => 'python', :allow_virtual => 'false')
6+
else
7+
pkg = Puppet::Type.type(:package).new(:name => 'python')
8+
end
69
Facter.add("system_python_version") do
710
setcode do
811
begin

lib/facter/virtualenv_version.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Make virtualenv version available as a fact
22
# Works with virualenv loaded and without, pip installed and package installed
33
require 'puppet'
4-
pkg = Puppet::Type.type(:package).new(:name => "virtualenv")
4+
if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
5+
pkg = Puppet::Type.type(:package).new(:name => 'virtualenv', :allow_virtual => 'false')
6+
else
7+
pkg = Puppet::Type.type(:package).new(:name => 'virtualenv')
8+
end
59
Facter.add("virtualenv_version") do
610
has_weight 100
711
setcode do

0 commit comments

Comments
 (0)