Skip to content
Permalink
Browse files

Remove duplicated hint.

At some point this hint got added to the underlying code so it is no longer needed here.
  • Loading branch information...
dwsteele committed May 22, 2019
1 parent ff9c1be commit e4cc008b982d47ac526962e310c18626e2aefbc2
Showing with 2 additions and 8 deletions.
  1. +1 −3 lib/pgBackRest/Stanza.pm
  2. +1 −3 src/perl/embed.auto.c
  3. +0 −1 test/expect/mock-stanza-001.log
  4. +0 −1 test/expect/mock-stanza-002.log
@@ -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
{
"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"
"{\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"
@@ -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)
@@ -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)

0 comments on commit e4cc008

Please sign in to comment.
You can’t perform that action at this time.