Skip to content
Snippets Groups Projects
Unverified Commit a675ea51 authored by sanfrancrisko's avatar sanfrancrisko Committed by GitHub
Browse files

Merge pull request #421 from da-ar/GH-419

(GH-419) Removal of win32 gems
parents a37c82f7 9f801503
Branches
Tags 2.1.0
No related merge requests found
...@@ -114,16 +114,6 @@ gems['puppet'] = location_for(puppet_version) ...@@ -114,16 +114,6 @@ gems['puppet'] = location_for(puppet_version)
gems['facter'] = location_for(facter_version) if facter_version gems['facter'] = location_for(facter_version) if facter_version
gems['hiera'] = location_for(hiera_version) if hiera_version gems['hiera'] = location_for(hiera_version) if hiera_version
if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
# If we're using a Puppet gem on Windows which handles its own win32-xxx gem
# dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
gems['win32-dir'] = ['<= 0.4.9', require: false]
gems['win32-eventlog'] = ['<= 0.6.5', require: false]
gems['win32-process'] = ['<= 0.7.5', require: false]
gems['win32-security'] = ['<= 0.2.5', require: false]
gems['win32-service'] = ['0.8.8', require: false]
end
gems.each do |gem_name, gem_params| gems.each do |gem_name, gem_params|
gem gem_name, *gem_params gem gem_name, *gem_params
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment