Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
6691c2f
)
Merge pull request #268 from daenney/apt_key-ftp-weirdness
author
Hunter Haugen
<hunter@puppetlabs.com>
Mon, 17 Mar 2014 17:03:22 +0000
(10:03 -0700)
committer
Hunter Haugen
<hunter@puppetlabs.com>
Mon, 17 Mar 2014 17:03:22 +0000
(10:03 -0700)
Use File.expand_path with require.
lib/puppet/provider/apt_key/apt_key.rb
patch
|
blob
|
history
diff --git
a/lib/puppet/provider/apt_key/apt_key.rb
b/lib/puppet/provider/apt_key/apt_key.rb
index 51791d024811444e18cde8abab1efc79b3904beb..f8d40728b04a13727d32f1ede6cd2eebe4eb52ac 100644
(file)
--- a/
lib/puppet/provider/apt_key/apt_key.rb
+++ b/
lib/puppet/provider/apt_key/apt_key.rb
@@
-6,7
+6,8
@@
require 'tempfile'
if RUBY_VERSION == '1.8.7'
# Mothers cry, puppies die and Ruby 1.8.7's open-uri needs to be
# 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,})
end