database/pgbackrest
database/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-04-18 21:24:08 +03:00
Code

Fix highlight error in user guide.

Browse Source 
87776bc9 updated the RHEL documentation to PostgreSQL 13/14 but did not update recovery highlighting to be compatible with RHEL. This was not caught because the RHEL documentation was being build as PDF, which does not do highlighting.

Instead build the RHEL documentation as HTML in the first stage (and PDF in the second) so the error is caught.

Finally, fix the RHEL documentation to generate the highlight by concatenating the log.
This commit is contained in:
David Steele 2025-04-15 16:50:40 -05:00
parent 8bdba74798
commit c2f64bb03b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release.pl
View File

@ -239,7 +239,7 @@ eval
{
&log(INFO, "Generate RHEL documentation");
executeTest("${strDocExe} --deploy --key-var=os-type=rhel --out=pdf", {bShowOutputAsync => true});
executeTest("${strDocExe} --deploy --key-var=os-type=rhel --out=html", {bShowOutputAsync => true});
if (!defined($strVm))
{

11
doc/xml/user-guide.xml
View File

@ -2264,11 +2264,20 @@
<exe-cmd>rm {[postgres-log-demo]}</exe-cmd>
</execute>
<execute if="{[pg-version]} &gt; 12" user="root" output="y" err-expect="1">
<execute if="{[pg-version]} &gt; 12 &amp;&amp; {[os-type-is-debian]}" user="root" output="y" err-expect="1">
<exe-cmd>{[pg-cluster-start]}</exe-cmd>
<exe-highlight>recovery ended before configured recovery target was reached</exe-highlight>
</execute>
<execute if="{[pg-version]} &gt; 12 &amp;&amp; {[os-type-is-rhel]}" user="root" err-expect="1">
<exe-cmd>{[pg-cluster-start]}</exe-cmd>
</execute>
<execute if="{[pg-version]} &gt; 12 &amp;&amp; {[os-type-is-rhel]}" user="postgres" output="y">
<exe-cmd>cat {[postgres-log-demo]}</exe-cmd>
<exe-highlight>recovery ended before configured recovery target was reached</exe-highlight>
</execute>
<execute if="{[pg-version]} &lt;= 12" user="root">
<exe-cmd>{[pg-cluster-start]}</exe-cmd>
</execute>