lib/puppet/configurer/plugin_handler.rb in puppet-0.25.5 vs lib/puppet/configurer/plugin_handler.rb in puppet-2.6.0

@@ -1,28 +1,28 @@
 # Break out the code related to plugins.  This module is
 # just included into the agent, but having it here makes it
 # easier to test.
 module Puppet::Configurer::PluginHandler
-    def download_plugins?
-        Puppet[:pluginsync]
-    end
+  def download_plugins?
+    Puppet[:pluginsync]
+  end
 
-    # Retrieve facts from the central server.
-    def download_plugins
-        return nil unless download_plugins?
-        Puppet::Configurer::Downloader.new("plugin", Puppet[:plugindest], Puppet[:pluginsource], Puppet[:pluginsignore]).evaluate.each { |file| load_plugin(file) }
-    end
+  # Retrieve facts from the central server.
+  def download_plugins
+    return nil unless download_plugins?
+    Puppet::Configurer::Downloader.new("plugin", Puppet[:plugindest], Puppet[:pluginsource], Puppet[:pluginsignore]).evaluate.each { |file| load_plugin(file) }
+  end
 
-    def load_plugin(file)
-        return unless FileTest.exist?(file)
-        return if FileTest.directory?(file)
+  def load_plugin(file)
+    return unless FileTest.exist?(file)
+    return if FileTest.directory?(file)
 
-        begin
-            Puppet.info "Loading downloaded plugin %s" % file
-            load file
-        rescue SystemExit,NoMemoryError
-            raise
-        rescue Exception => detail
-            Puppet.err "Could not load downloaded file %s: %s" % [file, detail]
-        end
+    begin
+      Puppet.info "Loading downloaded plugin #{file}"
+      load file
+    rescue SystemExit,NoMemoryError
+      raise
+    rescue Exception => detail
+      Puppet.err "Could not load downloaded file #{file}: #{detail}"
     end
+  end
 end