Merge pull request poise#78 from aclowes/master

coderanger · coderanger · commit 6e02e0cd24ef · 2014-01-27T23:53:55.000-08:00
[COOK-4244] Fix the pip version_check_cmd to use the virtualenv pip when applicable
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -112,7 +112,7 @@ def current_installed_version
 # incase you upgrade pip with pip!
 if new_resource.package_name.eql?('pip')
 delimeter = /\s/
- version_check_cmd = "pip --version"
+ version_check_cmd = "#{which_pip(@new_resource)} --version"
 end
 result = shell_out(version_check_cmd)
 (result.exitstatus == 0) ? result.stdout.split(delimeter)[1].strip : nil

-Original file line number
+Diff line change
 # incase you upgrade pip with pip!
 ifnew_resource.package_name.eql?('pip')
 delimeter=/\s/
 -version_check_cmd="pip --version"
 +version_check_cmd="#{which_pip(@new_resource)} --version"
 end
 result=shell_out(version_check_cmd)
 (result.exitstatus == 0) ? result.stdout.split(delimeter)[1].strip : nil