Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4b3ce7f

Browse files
author
Peter Bell
committed
backport patch from master
1 parent e5977be commit 4b3ce7f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

providers/pip.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
require 'chef/mixin/shell_out'
2222
require 'chef/mixin/language'
23-
require 'version'
23+
require 'versionub'
2424
include Chef::Mixin::ShellOut
2525

2626
def whyrun_supported?
@@ -128,11 +128,13 @@ def candidate_version
128128
if out.match(/not installed/) then
129129
new_resource.version||'latest'
130130
elsif out.match(/#{new_resource.package_name} [\d\.]+ \([\d\.]+\)/) then
131-
available_version = Version.new(out.split(' ').last.tr('()',''))
132-
if available_version > ( Version.new(new_resource.version) || Version.new('0.0') )
131+
available_version = Versionub.parse(out.split(' ').last.tr('()',''))
132+
if ! new_resource.version
133+
available_version.to_s
134+
elsif available_version > Versionub.parse(new_resource.version)
133135
new_resource.version
134136
else
135-
available_version
137+
available_version.to_s
136138
end
137139
else
138140
current_installed_version

recipes/pip.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
pip_binary = "/usr/local/bin/pip"
3434
end
3535

36-
chef_gem 'version' do
36+
chef_gem 'versionub' do
3737
action :nothing
3838
end.run_action(:install)
3939

0 commit comments

Comments
 (0)