opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #268 from daenney/apt_key-ftp-weirdness

Browse source 
Use File.expand_path with require.
This commit is contained in:
Hunter Haugen 2014-03-17 10:03:22 -07:00
commit 4d8f69d2cc
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/puppet/provider/apt_key/apt_key.rb
View file

@ -6,7 +6,8 @@ require 'tempfile'
if RUBY_VERSION == '1.8.7' if RUBY_VERSION == '1.8.7'
# Mothers cry, puppies die and Ruby 1.8.7's open-uri needs to be # Mothers cry, puppies die and Ruby 1.8.7's open-uri needs to be
# monkeypatched to support passing in :ftp_passive_mode. # monkeypatched to support passing in :ftp_passive_mode.
require 'puppet_x/apt_key/patch_openuri' require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'apt_key', 'patch_openuri.rb'))
OpenURI::Options.merge!({:ftp_active_mode => false,}) OpenURI::Options.merge!({:ftp_active_mode => false,})
end end