Changes to use puppet versioncmp method

petems · petems · commit 24b79d927ca0 · 2015-03-18T18:10:01.000Z
diff --git a/lib/facter/pip_version.rb b/lib/facter/pip_version.rb
@@ -8,11 +8,12 @@
     facter_puppet_version = facter_puppet_version.to_s.split(' ')[0]
 end
 
-if Gem::Version.new(facter_puppet_version) >= Gem::Version.new('3.6')
+if (Puppet::Util::Package.versioncmp(facter_puppet_version, '3.6') >= 0)
   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
@@ -8,11 +8,12 @@
     facter_puppet_version = facter_puppet_version.to_s.split(' ')[0]
 end
 
-if Gem::Version.new(facter_puppet_version) >= Gem::Version.new('3.6')
-  pkg = Puppet::Type.type(:package).new(:name => 'python', :allow_virtual => 'false')
+if (Puppet::Util::Package.versioncmp(facter_puppet_version, '3.6') >= 0)
+  pkg = Puppet::Type.type(:package).new(:name => 'python-pip', :allow_virtual => 'false')
 else
-  pkg = Puppet::Type.type(:package).new(:name => 'python')
+  pkg = Puppet::Type.type(:package).new(:name => 'python-pip')
 end
+
 Facter.add("system_python_version") do
   setcode do
     begin
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
@@ -8,11 +8,12 @@
     facter_puppet_version = facter_puppet_version.to_s.split(' ')[0]
 end
 
-if Gem::Version.new(facter_puppet_version) >= Gem::Version.new('3.6')
-  pkg = Puppet::Type.type(:package).new(:name => 'virtualenv', :allow_virtual => 'false')
+if (Puppet::Util::Package.versioncmp(facter_puppet_version, '3.6') >= 0)
+  pkg = Puppet::Type.type(:package).new(:name => 'python-pip', :allow_virtual => 'false')
 else
-  pkg = Puppet::Type.type(:package).new(:name => 'virtualenv')
+  pkg = Puppet::Type.type(:package).new(:name => 'python-pip')
 end
+
 Facter.add("virtualenv_version") do
   has_weight 100
   setcode do
