Merge pull request #1243 from alexjfisher/fix_task_error_message

Fix mysql::sql task error message
puppetlabs · Oct 16, 2019 · ab9292e · ab9292e
2 parents c04c1a6 + 973c46e
commit ab9292e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tasks/export.rb b/tasks/export.rb
@@ -9,8 +9,8 @@ def get(file, database, user, password)
   cmd_string << " --user=#{user}" unless user.nil?
   cmd_string << " --password=#{password}" unless password.nil?
   cmd_string << " > #{file}" unless file.nil?
-  stdout, _stderr, status = Open3.capture3(cmd_string)
-  raise Puppet::Error, _("stderr: ' %{stderr}') % { stderr: stderr }") if status != 0
+  stdout, stderr, status = Open3.capture3(cmd_string)
+  raise Puppet::Error, _("stderr: '%{stderr}'" % { stderr: stderr }) if status != 0
   { status: stdout.strip }
 end
 

diff --git a/tasks/sql.rb b/tasks/sql.rb
@@ -8,8 +8,8 @@ def get(sql, database, user, password)
   cmd << "--database=#{database}" unless database.nil?
   cmd << "--user=#{user}" unless user.nil?
   cmd << "--password=#{password}" unless password.nil?
-  stdout, stderr, status = Open3.capture3(*cmd) # rubocop:disable Lint/UselessAssignment
-  raise Puppet::Error, _("stderr: ' %{stderr}') % { stderr: stderr }") if status != 0
+  stdout, stderr, status = Open3.capture3(*cmd)
+  raise Puppet::Error, _("stderr: '%{stderr}'" % { stderr: stderr }) if status != 0
   { status: stdout.strip }
 end