Commit2941cb1

committed

Merge remote-tracking branch 'origin/pgpro_2605'

2 parents8df3a8c +01fedaf commit2941cb1Copy full SHA for 2941cb1

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`constchar*PROGRAM_VERSION="2.0.27";`
`23`	`23`	`constchar*PROGRAM_URL="https://github.com/postgrespro/pg_probackup";`
`24`	`24`	`constchar*PROGRAM_EMAIL="https://github.com/postgrespro/pg_probackup/issues";`
	`25`	`+constchar*PROGRAM_FULL_PATH=NULL;`
`25`	`26`
`26`	`27`	`typedefenumProbackupSubcmd`
`27`	`28`	`{`
`@@ -201,6 +202,14 @@ main(int argc, char *argv[])`
`201`	`202`	`init_config(&instance_config);`
`202`	`203`
`203`	`204`	`PROGRAM_NAME=get_progname(argv[0]);`
	`205`	`+PROGRAM_FULL_PATH=palloc0(MAXPGPATH);`
	`206`	`+`
	`207`	`+if (find_my_exec(argv[0],(char*)PROGRAM_FULL_PATH)<0)`
	`208`	`+{`
	`209`	`+fprintf(stderr,_("%s: could not find own program executable\n"),PROGRAM_NAME);`
	`210`	`+exit(1);`
	`211`	`+}`
	`212`	`+`
`204`	`213`	`set_pglocale_pgservice(argv[0],"pgscripts");`
`205`	`214`
`206`	`215`	`#ifPG_VERSION_NUM >=110000`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -796,7 +796,7 @@ create_recovery_conf(time_t backup_id,`
`796`	`796`
`797`	`797`	`fprintf(fp,"restore_command = '%s archive-get -B %s --instance %s "`
`798`	`798`	`"--wal-file-path %%p --wal-file-name %%f'\n",`
`799`		`-PROGRAM_NAME,backup_path,instance_name);`
	`799`	`+PROGRAM_FULL_PATH,backup_path,instance_name);`
`800`	`800`
`801`	`801`	`/*`
`802`	`802`	`* We've already checked that only one of the four following mutually`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ typedef void (pgut_atexit_callback)(bool fatal, void userdata);`
`20`	`20`	`* pgut client variables and functions`
`21`	`21`	`*/`
`22`	`22`	`externconstchar*PROGRAM_NAME;`
	`23`	`+externconstchar*PROGRAM_FULL_PATH;`
`23`	`24`	`externconstchar*PROGRAM_VERSION;`
`24`	`25`	`externconstchar*PROGRAM_URL;`
`25`	`26`	`externconstchar*PROGRAM_EMAIL;`

Comments

(0)