diff options
Diffstat (limited to 'lib/chef/provider/remote_file')
-rw-r--r-- | lib/chef/provider/remote_file/cache_control_data.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/remote_file/content.rb | 4 | ||||
-rw-r--r-- | lib/chef/provider/remote_file/ftp.rb | 4 | ||||
-rw-r--r-- | lib/chef/provider/remote_file/local_file.rb | 4 | ||||
-rw-r--r-- | lib/chef/provider/remote_file/network_file.rb | 4 | ||||
-rw-r--r-- | lib/chef/provider/remote_file/sftp.rb | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/chef/provider/remote_file/cache_control_data.rb b/lib/chef/provider/remote_file/cache_control_data.rb index 974b229a45..5742ac8ce6 100644 --- a/lib/chef/provider/remote_file/cache_control_data.rb +++ b/lib/chef/provider/remote_file/cache_control_data.rb @@ -19,7 +19,7 @@ # limitations under the License. # -require "stringio" +require "stringio" unless defined?(StringIO) require_relative "../../file_cache" require_relative "../../json_compat" require_relative "../../digester" diff --git a/lib/chef/provider/remote_file/content.rb b/lib/chef/provider/remote_file/content.rb index 3e1af01f22..8fe52288c0 100644 --- a/lib/chef/provider/remote_file/content.rb +++ b/lib/chef/provider/remote_file/content.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "uri" -require "tempfile" +require "uri" unless defined?(URI) +require "tempfile" unless defined?(Tempfile) require_relative "../../file_content_management/content_base" require_relative "../../mixin/uris" diff --git a/lib/chef/provider/remote_file/ftp.rb b/lib/chef/provider/remote_file/ftp.rb index b6399ee077..eafebc9693 100644 --- a/lib/chef/provider/remote_file/ftp.rb +++ b/lib/chef/provider/remote_file/ftp.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "uri" -require "tempfile" +require "uri" unless defined?(URI) +require "tempfile" unless defined?(Tempfile) require "net/ftp" require_relative "../remote_file" require_relative "../../file_content_management/tempfile" diff --git a/lib/chef/provider/remote_file/local_file.rb b/lib/chef/provider/remote_file/local_file.rb index eb1b88e1fa..14877806ce 100644 --- a/lib/chef/provider/remote_file/local_file.rb +++ b/lib/chef/provider/remote_file/local_file.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "uri" -require "tempfile" +require "uri" unless defined?(URI) +require "tempfile" unless defined?(Tempfile) require_relative "../remote_file" class Chef diff --git a/lib/chef/provider/remote_file/network_file.rb b/lib/chef/provider/remote_file/network_file.rb index 11d8dd2ff5..b08aeb55cc 100644 --- a/lib/chef/provider/remote_file/network_file.rb +++ b/lib/chef/provider/remote_file/network_file.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "uri" -require "tempfile" +require "uri" unless defined?(URI) +require "tempfile" unless defined?(Tempfile) require_relative "../remote_file" require_relative "../../mixin/user_context" diff --git a/lib/chef/provider/remote_file/sftp.rb b/lib/chef/provider/remote_file/sftp.rb index f112b3782c..3da49ebedd 100644 --- a/lib/chef/provider/remote_file/sftp.rb +++ b/lib/chef/provider/remote_file/sftp.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "uri" -require "tempfile" +require "uri" unless defined?(URI) +require "tempfile" unless defined?(Tempfile) require "net/sftp" require_relative "../remote_file" require_relative "../../file_content_management/tempfile" |