Merge branch 'COOK-1282'

jtimberman · jtimberman · commit d28651041da2 · 2012-07-30T17:54:50.000-06:00
diff --git a/providers/pip.rb b/providers/pip.rb
@@ -126,7 +126,8 @@ def current_installed_version
     end
     p = shell_out!(version_check_cmd)
     p.stdout.split(delimeter)[1].strip
-  rescue Chef::Exceptions::ShellCommandFailed, Mixlib::ShellOut::ShellCommandFailed
+  rescue Chef::Exceptions::ShellCommandFailed
+  rescue Mixlib::ShellOut::ShellCommandFailed
   end
 end
 
