Remove duplicated hint.

At some point this hint got added to the underlying code so it is no longer needed here.
pgbackrest · May 22, 2019 · e4cc008 · e4cc008
1 parent ff9c1be
commit e4cc008
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/lib/pgBackRest/Stanza.pm b/lib/pgBackRest/Stanza.pm
@@ -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 :
+                confess &log(ERROR, cfgOptionValid(CFGOPT_FORCE) ? $strResultMessage . $strHintForce : $strResultMessage, $iResult);
-                    $strResultMessage . $strHintStanzaCreate, $iResult);
             }
             else
             {

diff --git a/src/perl/embed.auto.c b/src/perl/embed.auto.c
@@ -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"
+            "confess &log(ERROR, cfgOptionValid(CFGOPT_FORCE) ? $strResultMessage . $strHintForce : $strResultMessage, $iResult);\n"
-            "$strResultMessage . $strHintStanzaCreate, $iResult);\n"
             "}\n"
             "else\n"
             "{\n"

diff --git a/test/expect/mock-stanza-001.log b/test/expect/mock-stanza-001.log
@@ -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)

diff --git a/test/expect/mock-stanza-002.log b/test/expect/mock-stanza-002.log
@@ -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)