lib/modulesync.rb in modulesync-2.3.1 vs lib/modulesync.rb in modulesync-2.4.0

@@ -81,22 +81,22 @@
       hook.deactivate
     end
   end
 
   def self.manage_file(puppet_module, filename, settings, options)
-    module_name = settings.additional_settings[:puppet_module]
     configs = settings.build_file_configs(filename)
     target_file = puppet_module.path(filename)
     if configs['delete']
       Renderer.remove(target_file)
     else
       templatename = local_file(options[:configs], filename)
       begin
         erb = Renderer.build(templatename)
         # Meta data passed to the template as @metadata[:name]
         metadata = {
-          :module_name => module_name,
+          :module_name => settings.additional_settings[:puppet_module],
+          :namespace => settings.additional_settings[:namespace],
           :workdir => puppet_module.working_directory,
           :target_file => target_file,
         }
         template = Renderer.render(erb, configs, metadata)
         Renderer.sync(template, target_file)
@@ -212,12 +212,10 @@
       result = system command_env, *command_args, unsetenv_others: true, chdir: puppet_module.working_directory
       unless result
         message = "Command execution failed ('#{@options[:command_args].join ' '}': #{$CHILD_STATUS})"
         raise Thor::Error, message if @options[:fail_fast]
 
-        errors.merge!(
-          puppet_module.given_name => message,
-        )
+        errors[puppet_module.given_name] = message
         $stderr.puts message
       end
 
       $stdout.puts ''
     end