Use #combine_command_args in #runcmd

ManageIQ · May 25, 2018 · 036e899 · 036e899
1 parent 656ddb4
commit 036e899
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/lib/gems/pending/util/postgres_admin.rb b/lib/gems/pending/util/postgres_admin.rb
@@ -207,13 +207,7 @@ def self.reindex(opts)
   end
 
   def self.runcmd(cmd_str, opts, args)
-    default_args            = {:no_password => nil}
-    default_args[:dbname]   = opts[:dbname]   if opts[:dbname]
-    default_args[:username] = opts[:username] if opts[:username]
-    default_args[:host]     = opts[:hostname] if opts[:hostname]
-    args = default_args.merge(args)
-
-    runcmd_with_logging(cmd_str, opts, args)
+    runcmd_with_logging(cmd_str, opts, combine_command_args(opts, args))
   end
 
   def self.runcmd_with_logging(cmd_str, opts, params = {})