db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-05 00:28:52 +02:00
Code Issues Releases Activity

Remove extraneous space from error messages.

Browse Source
This commit is contained in:
David Steele
2023-05-02 12:07:28 +03:00
parent 9637d94490
commit 5ea7b91bf9
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/build/common/yaml.c
View File

@ -233,7 +233,7 @@ yamlScalarCheck(const YamlEvent event, const String *const value)
if (event.type != yamlEventTypeScalar) if (event.type != yamlEventTypeScalar)
{ {
THROW_FMT( THROW_FMT(
FormatError, "expected scalar '%s' but got event type '%s' at line %zu, column %zu", strZ(value), FormatError, "expected scalar '%s' but got event type '%s' at line %zu, column %zu", strZ(value),
strZ(strIdToStr(event.type)), event.line, event.column); strZ(strIdToStr(event.type)), event.line, event.column);
} }

4
src/command/restore/restore.c
View File

@ -79,8 +79,8 @@ restorePathValidate(void)
{ {
LOG_WARN_FMT( LOG_WARN_FMT(
"--delta or --force specified but unable to find '" PG_FILE_PGVERSION "' or '" BACKUP_MANIFEST_FILE "' in '%s' to" "--delta or --force specified but unable to find '" PG_FILE_PGVERSION "' or '" BACKUP_MANIFEST_FILE "' in '%s' to"
" confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files" " confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist"
" exist in the destination directories the restore will be aborted.", " in the destination directories the restore will be aborted.",
strZ(cfgOptionDisplay(cfgOptPgPath))); strZ(cfgOptionDisplay(cfgOptPgPath)));
// Disable delta and force so restore will fail if the directories are not empty // Disable delta and force so restore will fail if the directories are not empty

2
test/src/module/build/commonTest.c
View File

@ -49,7 +49,7 @@ testRun(void)
TEST_RESULT_VOID(yamlScalarNextCheck(yaml, STRDEF("test")), "scalar event"); TEST_RESULT_VOID(yamlScalarNextCheck(yaml, STRDEF("test")), "scalar event");
TEST_ERROR( TEST_ERROR(
yamlScalarCheck(yamlEventPeek(yaml), STRDEF("test")), FormatError, yamlScalarCheck(yamlEventPeek(yaml), STRDEF("test")), FormatError,
"expected scalar 'test' but got event type 'map-begin' at line 2, column 4"); "expected scalar 'test' but got event type 'map-begin' at line 2, column 4");
TEST_RESULT_VOID(yamlEventNextCheck(yaml, yamlEventTypeMapBegin), "map begin event"); TEST_RESULT_VOID(yamlEventNextCheck(yaml, yamlEventTypeMapBegin), "map begin event");
TEST_RESULT_VOID(yamlEventNextCheck(yaml, yamlEventTypeScalar), "scalar event"); TEST_RESULT_VOID(yamlEventNextCheck(yaml, yamlEventTypeScalar), "scalar event");
TEST_RESULT_VOID(yamlEventNextCheck(yaml, yamlEventTypeSeqBegin), "seq begin event"); TEST_RESULT_VOID(yamlEventNextCheck(yaml, yamlEventTypeSeqBegin), "seq begin event");

8
test/src/module/command/restoreTest.c
View File

@ -295,8 +295,8 @@ testRun(void)
TEST_RESULT_BOOL(cfgOptionBool(cfgOptDelta), false, "--delta set to false"); TEST_RESULT_BOOL(cfgOptionBool(cfgOptDelta), false, "--delta set to false");
TEST_RESULT_LOG( TEST_RESULT_LOG(
"P00 WARN: --delta or --force specified but unable to find 'PG_VERSION' or 'backup.manifest' in '" TEST_PATH "/pg' to" "P00 WARN: --delta or --force specified but unable to find 'PG_VERSION' or 'backup.manifest' in '" TEST_PATH "/pg' to"
" confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files" " confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist in the"
" exist in the destination directories the restore will be aborted."); " destination directories the restore will be aborted.");
HRN_CFG_LOAD(cfgCmdRestore, argList); HRN_CFG_LOAD(cfgCmdRestore, argList);
HRN_STORAGE_PUT_EMPTY(storagePgWrite(), "backup.manifest"); HRN_STORAGE_PUT_EMPTY(storagePgWrite(), "backup.manifest");
@ -317,8 +317,8 @@ testRun(void)
TEST_RESULT_BOOL(cfgOptionBool(cfgOptForce), false, "--force set to false"); TEST_RESULT_BOOL(cfgOptionBool(cfgOptForce), false, "--force set to false");
TEST_RESULT_LOG( TEST_RESULT_LOG(
"P00 WARN: --delta or --force specified but unable to find 'PG_VERSION' or 'backup.manifest' in '" TEST_PATH "/pg' to" "P00 WARN: --delta or --force specified but unable to find 'PG_VERSION' or 'backup.manifest' in '" TEST_PATH "/pg' to"
" confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files" " confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist in the"
" exist in the destination directories the restore will be aborted."); " destination directories the restore will be aborted.");
HRN_CFG_LOAD(cfgCmdRestore, argList); HRN_CFG_LOAD(cfgCmdRestore, argList);
HRN_STORAGE_PUT_EMPTY(storagePgWrite(), PG_FILE_PGVERSION); HRN_STORAGE_PUT_EMPTY(storagePgWrite(), PG_FILE_PGVERSION);