Commitc0b30ed

committed

rename default_username()

1 parent1b6eff0 commitc0b30edCopy full SHA for c0b30ed

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ def __init__(self,`
`175`	`175`	`password=None):`
`176`	`176`
`177`	`177`	`# Use default user if not specified`
`178`		`-username=usernameor_default_username()`
	`178`	`+username=usernameordefault_username()`
`179`	`179`
`180`	`180`	`self.parent_node=parent_node`
`181`	`181`
`@@ -268,7 +268,7 @@ def __init__(self,`
`268`	`268`	`raiseBackupException('Node must be running')`
`269`	`269`
`270`	`270`	`# set default arguments`
`271`		`-username=usernameor_default_username()`
	`271`	`+username=usernameordefault_username()`
`272`	`272`	`base_dir=base_dirortempfile.mkdtemp()`
`273`	`273`
`274`	`274`	`# create directory if needed`
`@@ -985,14 +985,6 @@ def connect(self, dbname='postgres', username=None):`
`985`	`985`	`username=username)`
`986`	`986`
`987`	`987`
`988`		`-def_default_username():`
`989`		`-"""`
`990`		`- Return current user.`
`991`		`- """`
`992`		`-`
`993`		`-returnpwd.getpwuid(os.getuid())[0]`
`994`		`-`
`995`		`-`
`996`	`988`	`def_cached_initdb(data_dir,initdb_logfile,initdb_params=[]):`
`997`	`989`	`"""`
`998`	`990`	`Perform initdb or use cached node files.`
`@@ -1068,6 +1060,14 @@ def _execute_utility(util, args, logfile, write_to_pipe=True):`
`1068`	`1060`	`returnout`
`1069`	`1061`
`1070`	`1062`
	`1063`	`+defdefault_username():`
	`1064`	`+"""`
	`1065`	`+ Return current user.`
	`1066`	`+ """`
	`1067`	`+`
	`1068`	`+returnpwd.getpwuid(os.getuid())[0]`
	`1069`	`+`
	`1070`	`+`
`1071`	`1071`	`defget_bin_path(filename):`
`1072`	`1072`	`"""`
`1073`	`1073`	`Return full path to an executable using get_pg_config().`

Comments

(0)