diff --git a/src/build/common/yaml.c b/src/build/common/yaml.c index 1009d3fde..86daad5c8 100644 --- a/src/build/common/yaml.c +++ b/src/build/common/yaml.c @@ -233,7 +233,7 @@ yamlScalarCheck(const YamlEvent event, const String *const value) if (event.type != yamlEventTypeScalar) { 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); } diff --git a/src/command/restore/restore.c b/src/command/restore/restore.c index 3fb39789d..c4b28cc25 100644 --- a/src/command/restore/restore.c +++ b/src/command/restore/restore.c @@ -79,8 +79,8 @@ restorePathValidate(void) { LOG_WARN_FMT( "--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" - " exist in the destination directories the restore will be aborted.", + " confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist" + " in the destination directories the restore will be aborted.", strZ(cfgOptionDisplay(cfgOptPgPath))); // Disable delta and force so restore will fail if the directories are not empty diff --git a/test/src/module/build/commonTest.c b/test/src/module/build/commonTest.c index 1ac31e58c..816de5c22 100644 --- a/test/src/module/build/commonTest.c +++ b/test/src/module/build/commonTest.c @@ -49,7 +49,7 @@ testRun(void) TEST_RESULT_VOID(yamlScalarNextCheck(yaml, STRDEF("test")), "scalar event"); TEST_ERROR( 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, yamlEventTypeScalar), "scalar event"); TEST_RESULT_VOID(yamlEventNextCheck(yaml, yamlEventTypeSeqBegin), "seq begin event"); diff --git a/test/src/module/command/restoreTest.c b/test/src/module/command/restoreTest.c index 5ae68cb94..c5f0487b0 100644 --- a/test/src/module/command/restoreTest.c +++ b/test/src/module/command/restoreTest.c @@ -295,8 +295,8 @@ testRun(void) TEST_RESULT_BOOL(cfgOptionBool(cfgOptDelta), false, "--delta set to false"); TEST_RESULT_LOG( "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" - " exist in the destination directories the restore will be aborted."); + " confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist in the" + " destination directories the restore will be aborted."); HRN_CFG_LOAD(cfgCmdRestore, argList); 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_LOG( "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" - " exist in the destination directories the restore will be aborted."); + " confirm that this is a valid $PGDATA directory. --delta and --force have been disabled and if any files exist in the" + " destination directories the restore will be aborted."); HRN_CFG_LOAD(cfgCmdRestore, argList); HRN_STORAGE_PUT_EMPTY(storagePgWrite(), PG_FILE_PGVERSION);