Merge pull request #217 from myii/patch-2

Prevent default `fromrepo` being evaluated as string 'None'
This commit is contained in:
N
2018-06-06 19:45:11 +01:00
committed by GitHub
3 changed files with 9 additions and 6 deletions

View File

@@ -13,7 +13,7 @@
{# use upstream version if configured #}
{% if repo.use_upstream_repo == true %}
{% set version = repo.version %}
{% set fromrepo = repo.fromrepo or name + '-pgdg' %}
{% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
{% else %}
{% set fromrepo = name %}
{% endif %}
@@ -38,7 +38,7 @@
{# use upstream version if configured #}
{% if repo.use_upstream_repo == true %}
{% set fromrepo = repo.fromrepo or name + '-pgdg' %}
{% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
{% set version = repo.version %}
{% else %}
{% set fromrepo = name %}