db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-06 03:53:59 +02:00
Code Issues Releases Activity

Fix --target-action and --recovery-option options being reported as invalid when restoring with --type=immediate.

Browse Source 
Reported by Brad Nicholson.
This commit is contained in:
David Steele 2018-03-06 17:12:16 -05:00
parent 4c8ed3530c
commit 5e0ce3e996
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/lib/pgBackRestBuild/Config/Data.pm
View File

@ -701,6 +701,7 @@ my %hConfigDefine =
&CFGDEF_DEPEND_OPTION => CFGOPT_TYPE, &CFGDEF_DEPEND_OPTION => CFGOPT_TYPE,
&CFGDEF_DEPEND_LIST => &CFGDEF_DEPEND_LIST =>
[ [
&CFGOPTVAL_RESTORE_TYPE_IMMEDIATE,
&CFGOPTVAL_RESTORE_TYPE_NAME, &CFGOPTVAL_RESTORE_TYPE_NAME,
&CFGOPTVAL_RESTORE_TYPE_TIME, &CFGOPTVAL_RESTORE_TYPE_TIME,
&CFGOPTVAL_RESTORE_TYPE_XID, &CFGOPTVAL_RESTORE_TYPE_XID,
@ -1886,6 +1887,7 @@ my %hConfigDefine =
&CFGDEF_DEPEND_LIST => &CFGDEF_DEPEND_LIST =>
[ [
&CFGOPTVAL_RESTORE_TYPE_DEFAULT, &CFGOPTVAL_RESTORE_TYPE_DEFAULT,
&CFGOPTVAL_RESTORE_TYPE_IMMEDIATE,
&CFGOPTVAL_RESTORE_TYPE_NAME, &CFGOPTVAL_RESTORE_TYPE_NAME,
&CFGOPTVAL_RESTORE_TYPE_TIME, &CFGOPTVAL_RESTORE_TYPE_TIME,
&CFGOPTVAL_RESTORE_TYPE_XID, &CFGOPTVAL_RESTORE_TYPE_XID,

15
doc/xml/release.xml
View File

@ -14,6 +14,16 @@
<release-list> <release-list>
<release date="XXXX-XX-XX" version="2.01dev" title="UNDER DEVELOPMENT"> <release date="XXXX-XX-XX" version="2.01dev" title="UNDER DEVELOPMENT">
<release-core-list> <release-core-list>
<release-bug-list>
<release-item>
<release-item-contributor-list>
<release-item-ideator id="nicholson.brad"/>
</release-item-contributor-list>
<p>Fix <br-option>--target-action</br-option> and <br-option>--recovery-option</br-option> options being reported as invalid when restoring with <br-option>--type=immediate</br-option>.</p>
</release-item>
</release-bug-list>
<release-improvement-list> <release-improvement-list>
<release-item> <release-item>
<release-item-contributor-list> <release-item-contributor-list>
@ -4208,6 +4218,11 @@
<contributor-id type="github">jmccormick2001</contributor-id> <contributor-id type="github">jmccormick2001</contributor-id>
</contributor> </contributor>
<contributor id="nicholson.brad">
<contributor-name-display>Brad Nicholson</contributor-name-display>
<contributor-id type="github">bradnicholson</contributor-id>
</contributor>
<contributor id="nullmeier.markus"> <contributor id="nullmeier.markus">
<contributor-name-display>Markus Nullmeier</contributor-name-display> <contributor-name-display>Markus Nullmeier</contributor-name-display>
<contributor-id type="github">mnullmei</contributor-id> <contributor-id type="github">mnullmei</contributor-id>

2
src/config/define.auto.c
View File

@ -2137,6 +2137,7 @@ static ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST
( (
cfgDefOptType, cfgDefOptType,
"default", "default",
"immediate",
"name", "name",
"time", "time",
"xid" "xid"
@ -3619,6 +3620,7 @@ static ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST
CFGDEFDATA_OPTION_OPTIONAL_DEPEND_LIST CFGDEFDATA_OPTION_OPTIONAL_DEPEND_LIST
( (
cfgDefOptType, cfgDefOptType,
"immediate",
"name", "name",
"time", "time",
"xid" "xid"