upload_essentials.rb in knife-essentials-0.8.2

- old
+ new

@@ -1,11 +1,11 @@
 require 'chef_fs/knife'
 require 'chef_fs/command_line'
 
 class Chef
   class Knife
-    remove_const(:Upload) if const_defined?(:Upload) # override Chef's version
+    remove_const(:Upload) if const_defined?(:Upload) && Upload.name == 'Chef::Knife::Upload' # override Chef's version
     class Upload < ::ChefFS::Knife
       ChefFS = ::ChefFS
       banner "knife upload PATTERNS"
 
       common_options
@@ -41,10 +41,10 @@
           ui.fatal("Must specify at least one argument.  If you want to upload everything in this directory, type \"knife upload .\"")
           exit 1
         end
 
         pattern_args.each do |pattern|
-          ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config)
+          ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui)
         end
       end
     end
   end
 end