db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00
Code Issues Releases Activity

Remove duplicated hint.

Browse Source 
At some point this hint got added to the underlying code so it is no longer needed here.
This commit is contained in:
David Steele 2019-05-22 11:31:38 -04:00
parent ff9c1bed5d
commit e4cc008b98
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pgBackRest/Stanza.pm
View File

@ -36,7 +36,6 @@ my $strHintForce = "\nHINT: use stanza-create --force to force the stanza data t
my $strInfoMissing = " information missing";
my $strStanzaCreateErrorMsg = "not empty";
my $strRepoEncryptedMsg = " and repo is encrypted and info file(s) are missing, --force cannot be used";
my $strHintStanzaCreate = "\nHINT: has a stanza-create been performed?";
####################################################################################################################################
# CONSTRUCTOR
@ -592,8 +591,7 @@ sub infoObject
{
if ($iResult == ERROR_FILE_MISSING)
{
confess &log(ERROR, cfgOptionValid(CFGOPT_FORCE) ? $strResultMessage . $strHintForce :
$strResultMessage . $strHintStanzaCreate, $iResult);
confess &log(ERROR, cfgOptionValid(CFGOPT_FORCE) ? $strResultMessage . $strHintForce : $strResultMessage, $iResult);
}
else
{

4
src/perl/embed.auto.c
View File

@ -15173,7 +15173,6 @@ static const EmbeddedModule embeddedModule[] =
"my $strInfoMissing = \" information missing\";\n"
"my $strStanzaCreateErrorMsg = \"not empty\";\n"
"my $strRepoEncryptedMsg = \" and repo is encrypted and info file(s) are missing, --force cannot be used\";\n"
"my $strHintStanzaCreate = \"\\nHINT: has a stanza-create been performed?\";\n"
"\n\n\n\n"
"sub new\n"
"{\n"
@ -15622,8 +15621,7 @@ static const EmbeddedModule embeddedModule[] =
"{\n"
"if ($iResult == ERROR_FILE_MISSING)\n"
"{\n"
"confess &log(ERROR, cfgOptionValid(CFGOPT_FORCE) ? $strResultMessage . $strHintForce :\n"
"$strResultMessage . $strHintStanzaCreate, $iResult);\n"
"confess &log(ERROR, cfgOptionValid(CFGOPT_FORCE) ? $strResultMessage . $strHintForce : $strResultMessage, $iResult);\n"
"}\n"
"else\n"
"{\n"

1
test/expect/mock-stanza-001.log
View File

@ -16,7 +16,6 @@ P00 ERROR: [055]: archive.info does not exist but is required to push/get WAL s
HINT: is archive_command configured in postgresql.conf?
HINT: has a stanza-create been performed?
HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme.
HINT: has a stanza-create been performed?
P00 INFO: stanza-upgrade command end: aborted with exception [055]
stanza-create db - successfully create the stanza (db-master host)

1
test/expect/mock-stanza-002.log
View File

@ -16,7 +16,6 @@ P00 ERROR: [055]: archive.info does not exist but is required to push/get WAL s
HINT: is archive_command configured in postgresql.conf?
HINT: has a stanza-create been performed?
HINT: use --no-archive-check to disable archive checks during backup if you have an alternate archiving scheme.
HINT: has a stanza-create been performed?
P00 INFO: stanza-upgrade command end: aborted with exception [055]
stanza-create db - successfully create the stanza (backup host)