valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove useless argument from _run_psql

Browse Source 
This seems not to be used anywhere, let's make it a bit simpler.
This commit is contained in:
David Douard 2015-03-04 12:35:29 +01:00
parent a52ebdac3b
commit aec180376d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/postgres.py
View File

@ -73,8 +73,7 @@ def __virtual__():
return False
def _run_psql(cmd, runas=None, password=None, host=None, port=None, user=None,
run_cmd='cmd.run_all'):
def _run_psql(cmd, runas=None, password=None, host=None, port=None, user=None):
'''
Helper function to call psql, because the password requirement
makes this too much code to be repeated in each function below
@ -114,7 +113,7 @@ def _run_psql(cmd, runas=None, password=None, host=None, port=None, user=None,
__salt__['file.chown'](pgpassfile, runas, '')
kwargs['env'] = {'PGPASSFILE': pgpassfile}
ret = __salt__[run_cmd](cmd, python_shell=False, **kwargs)
ret = __salt__['cmd.run_all'](cmd, python_shell=False, **kwargs)
if ret.get('retcode', 0) != 0:
log.error('Error connecting to Postgresql server')