mirror of
https://github.com/pgbackrest/pgbackrest.git
synced 2024-12-12 10:04:14 +02:00
Fix yum.p.o package being installed when custom package specified.
The {[os-type-is-centos]} expression was missing parens which meant "and" expressions built on it would always evaluate true if the os-type was centos6. Reported by Joe Ayers, John Harvey.
This commit is contained in:
parent
7d8068f27b
commit
0b5720c642
@ -72,6 +72,17 @@
|
||||
</release-core-list>
|
||||
|
||||
<release-doc-list>
|
||||
<release-bug-list>
|
||||
<release-item>
|
||||
<release-item-contributor-list>
|
||||
<release-item-ideator id="joe.ayers"/>
|
||||
<release-item-ideator id="john.harvey"/>
|
||||
</release-item-contributor-list>
|
||||
|
||||
<p>Fix <id>yum.p.o</id> package being installed when custom package specified.</p>
|
||||
</release-item>
|
||||
</release-bug-list>
|
||||
|
||||
<release-improvement-list>
|
||||
<release-item>
|
||||
<release-item-contributor-list>
|
||||
|
@ -30,7 +30,7 @@
|
||||
<variable key="os-type-is-debian">'{[os-type]}' eq '{[os-debian]}'</variable>
|
||||
<variable key="os-type-is-centos6">'{[os-type]}' eq '{[os-centos6]}'</variable>
|
||||
<variable key="os-type-is-centos7">'{[os-type]}' eq '{[os-centos7]}'</variable>
|
||||
<variable key="os-type-is-centos">{[os-type-is-centos6]} || {[os-type-is-centos7]}</variable>
|
||||
<variable key="os-type-is-centos">({[os-type-is-centos6]} || {[os-type-is-centos7]})</variable>
|
||||
|
||||
<!-- Defines the container image that will be used to build the host -->
|
||||
<variable key="os-image" if="{[os-type-is-debian]}">ubuntu:16.04</variable>
|
||||
|
Loading…
Reference in New Issue
Block a user