Merge pull request voxpupuli#142 from eshamow/fix_accidental_deprecation

shivapoudel · shivapoudel · commit f8f6d15dd459 · 2014-11-04T12:05:14.000+05:45
Add fix to detect older puppet while setting allow_virtual for &gt; 3.6
diff --git a/lib/facter/pip_version.rb b/lib/facter/pip_version.rb
@@ -1,7 +1,11 @@
 # Make pip version available as a fact
 # Works with pip loaded and without, pip installed using pip  and package installed
 require 'puppet'
-pkg = Puppet::Type.type(:package).new(:name => "python-pip")
+if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
+  pkg = Puppet::Type.type(:package).new(:name => 'python-pip', :allow_virtual => 'false')
+else
+  pkg = Puppet::Type.type(:package).new(:name => 'python-pip')
+end
 Facter.add("pip_version") do
   has_weight 100
   setcode do
diff --git a/lib/facter/python_version.rb b/lib/facter/python_version.rb
@@ -1,8 +1,11 @@
 # Make python versions available as facts
 # In lists default python and system python versions
 require 'puppet'
-pkg = Puppet::Type.type(:package).new(:name => "python")
-
+if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
+  pkg = Puppet::Type.type(:package).new(:name => 'python', :allow_virtual => 'false')
+else
+  pkg = Puppet::Type.type(:package).new(:name => 'python')
+end
 Facter.add("system_python_version") do
   setcode do
     begin
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
@@ -1,7 +1,11 @@
 # Make virtualenv version available as a fact
 # Works with virualenv loaded and without, pip installed and package installed
 require 'puppet'
-pkg = Puppet::Type.type(:package).new(:name => "virtualenv")
+if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
+  pkg = Puppet::Type.type(:package).new(:name => 'virtualenv', :allow_virtual => 'false')
+else
+  pkg = Puppet::Type.type(:package).new(:name => 'virtualenv')
+end
 Facter.add("virtualenv_version") do
   has_weight 100
   setcode do
