strip target_matched, use tempfile=nil instead

1 files changed, 11 insertions, 13 deletions

diff --git a/lib/chef/provider/remote_file/local_file.rb b/lib/chef/provider/remote_file/local_file.rb
index e9df6aa216..346867348d 100644
--- a/lib/chef/provider/remote_file/local_file.rb
+++ b/lib/chef/provider/remote_file/local_file.rb
@@ -23,22 +23,20 @@ require 'chef/provider/remote_file'
 class Chef
   class Provider
     class RemoteFile
-      class LocalFile < ::File
+      class LocalFile
 
         # Fetches the file at uri, returning a Tempfile-like File handle
         def self.fetch(uri, if_modified_since)
-          raw_file = LocalFile.new(uri.path)
-					mtime = raw_file.mtime
-          target_matched = mtime && if_modified_since && mtime.to_i <= if_modified_since.to_i
-					if target_matched
-						raw_file.close
-						raw_file = nil
-					end
-          return raw_file, mtime, target_matched
-        end
-
-        def close!
-          close
+          mtime = ::File.mtime(uri.path)
+          if mtime && if_modified_since && mtime.to_i <= if_modified_since.to_i
+            tempfile = nil
+          else
+            tempfile = Tempfile.new(File.basename(uri.path))
+            Chef::Log.debug("#{@new_resource} staging #{uri.path} to #{tempfile.path}")
+            FileUtils.cp(uri.path, tempfile.path)
+            tempfile
+          end
+          return tempfile, mtime
         end
 
       end