From a33b2df3f89a591a1bce70c62029efb07248d216 Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Sat, 6 Oct 2012 18:23:42 +0100 Subject: [PATCH] Consistent naming --- ckanext/datastore/commands.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ckanext/datastore/commands.py b/ckanext/datastore/commands.py index 30868a1c34e..179ec79647c 100644 --- a/ckanext/datastore/commands.py +++ b/ckanext/datastore/commands.py @@ -134,17 +134,17 @@ def _run_sql(self, sql, as_sql_user, database='postgres'): ), inputstring=sql) def create_db(self): - cmd = "sudo -u {pg_user} createdb -O '{ckan_user}' '{db}'".format( - pg_user=self.sql_superuser, + cmd = "sudo -u {pguser} createdb -O '{ckanuser}' '{db}'".format( + pguser=self.sql_superuser, db=self.db_write_url_parts['db_name'], - ckan_user=self.db_ckan_url_parts['db_user']) + ckanuser=self.db_ckan_url_parts['db_user']) self._run_cmd(cmd) def create_write_user(self): - cmd = "sudo -u {pg_user} createuser \ - --no-createdb --no-createrole --no-superuser '{write_user}'".format( - pg_user=self.sql_superuser, - write_user=self.db_write_url_parts['db_user']) + cmd = "sudo -u {pguser} createuser \ + --no-createdb --no-createrole --no-superuser '{writeuser}'".format( + pguser=self.sql_superuser, + writeuser=self.db_write_url_parts['db_user']) self._run_cmd(cmd) def create_read_only_user(self):