From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 17 Mar 2014 17:03:22 +0000 (-0700)
Subject: Merge pull request #268 from daenney/apt_key-ftp-weirdness
X-Git-Tag: 1.5.0~20
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4d8f69d2ccff7367156a7a1f1de7d2534b11a764;hp=6691c2faded01d273672b4db36f5a8651d3a934f;p=puppet-modules%2Fpuppetlabs-apt.git

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

Use File.expand_path with require.
---

diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
index 51791d0..f8d4072 100644
--- 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