1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00

Fixed an issue where specifying --no-archive-check would throw a configuration error.

This commit is contained in:
David Steele 2016-01-03 20:21:30 -05:00
parent 7f630aec49
commit 6f6c796fbf
4 changed files with 5 additions and 4 deletions

View File

@ -3,7 +3,7 @@
## v0.90dev: UNDER DEVELOPMENT
__No Release Date Set__
*
* Fixed an issue where specifying `--no-archive-check` would throw a configuration error. _Reported by Jason O'Donnell_.
## v0.89: Timeout Bug Fix and Restore Read-Only Repositories
__Released December 24, 2015__

View File

@ -9,7 +9,7 @@
<changelog-release date="XXXX-XX-XX" version="0.90dev" title="UNDER DEVELOPMENT">
<release-feature-bullet-list>
<release-feature>
<text></text>
<text>Fixed an issue where specifying <setting>--no-archive-check</setting> would throw a configuration error. <i>Reported by Jason O'Donnell</i>.</text>
</release-feature>
</release-feature-bullet-list>
</changelog-release>

View File

@ -732,7 +732,8 @@ sub process
$oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_HARDLINK, undef, $bHardLink);
$oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_START_STOP, undef, !optionGet(OPTION_NO_START_STOP));
$oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_ARCHIVE_COPY, undef,
optionGet(OPTION_NO_START_STOP) || optionGet(OPTION_BACKUP_ARCHIVE_COPY));
optionGet(OPTION_NO_START_STOP) ||
(optionGet(OPTION_BACKUP_ARCHIVE_CHECK) && optionGet(OPTION_BACKUP_ARCHIVE_COPY)));
$oBackupManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_ARCHIVE_CHECK, undef,
optionGet(OPTION_NO_START_STOP) || optionGet(OPTION_BACKUP_ARCHIVE_CHECK));

View File

@ -1436,7 +1436,7 @@ sub BackRestTestBackup_Test
$strComment = 'update during backup';
BackRestTestBackup_BackupBegin($strType, $strStanza, $strComment,
{strTest => TEST_MANIFEST_BUILD, fTestDelay => $fTestDelay,
strOptionalParam => '--' . OPTION_STOP_AUTO});
strOptionalParam => '--' . OPTION_STOP_AUTO . ' --no-' . OPTION_BACKUP_ARCHIVE_CHECK});
BackRestTestBackup_PgExecute("drop table test_remove", false);
BackRestTestBackup_PgSwitchXlog();