From 036e89966cdc3001ae9d2a382fad9e5f00bb54a2 Mon Sep 17 00:00:00 2001 From: Nick LaMuro Date: Wed, 9 May 2018 18:52:55 -0500 Subject: [PATCH] Use #combine_command_args in #runcmd --- lib/gems/pending/util/postgres_admin.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/gems/pending/util/postgres_admin.rb b/lib/gems/pending/util/postgres_admin.rb index 9ef989248..d8be2e708 100644 --- 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 = {})