diff options
| author | Thom May <thom@may.lt> | 2016-08-30 11:08:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 11:08:20 +0100 |
| commit | 35ea3d58fa3d7ede1b0b803cb205aaf9a0489e64 (patch) | |
| tree | a92ba914527bb90ebfdd37e9e1e8fe0cb01d4482 | |
| parent | 9b91b6e033b62e7668b1b42601795db3b42088c9 (diff) | |
| parent | 784f022da32808b57b89fc39d2d2461a9f635be0 (diff) | |
| download | chef-35ea3d58fa3d7ede1b0b803cb205aaf9a0489e64.tar.gz | |
Merge pull request #5262 from chef/lcg/gem-package-regression
fix gem_package regression in master
| -rw-r--r-- | kitchen-tests/cookbooks/base/recipes/packages.rb | 8 | ||||
| -rw-r--r-- | lib/chef/provider/package/rubygems.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb index c3a552b05c..1ca8d81968 100644 --- a/kitchen-tests/cookbooks/base/recipes/packages.rb +++ b/kitchen-tests/cookbooks/base/recipes/packages.rb @@ -7,3 +7,11 @@ pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversio pkgs.each do |pkg| multipackage pkgs end + +gems = %w{fpm aws-sdk} + +gems.each do |gem| + chef_gem gem do + compile_time false + end +end diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index 0fd9373dbf..b5f2340faf 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -170,7 +170,7 @@ class Chef # Use the API that 'gem install' calls which does not pull down the rubygems universe begin rs = dependency_installer.resolve_dependencies gem_dependency.name, gem_dependency.requirement - rs.specs.first + rs.specs.select { |s| s.name == gem_dependency.name }.first rescue Gem::UnsatisfiableDependencyError nil end |