Tidyup codenamemap.yaml

This commit is contained in:
Noel McLoughlin 2018-05-09 17:48:09 +01:00
parent 6e21e4914a
commit c476099a5e

View file

@ -2,19 +2,14 @@
{% import_yaml "postgres/repo.yaml" as repo %} {% import_yaml "postgres/repo.yaml" as repo %}
{% macro debian_codename(name, version, codename=none) %} {# Generate lookup dictionary map for OS and derivative distributions
{# name: distro codename
Generate lookup dictionary map for Debian and derivative distributions version: PostgreSQL release version
codename: optional grain value if `name` does not match the one returned by `oscodename` grain
name:
distro codename
version:
PostgreSQL release version
codename:
optional grain value if `name` does not match the one returned by
`oscodename` grain
#} #}
{% macro debian_codename(name, version, codename=none) %}
{# use upstream version if configured #} {# use upstream version if configured #}
{% if repo.use_upstream_repo == true %} {% if repo.use_upstream_repo == true %}
{% set version = repo.version %} {% set version = repo.version %}
@ -40,21 +35,13 @@
{% macro fedora_codename(name, version, codename=none) %} {% macro fedora_codename(name, version, codename=none) %}
{#
Generate lookup dictionary map for Fedora distributions
name:
distro codename
version:
PostgreSQL release version
codename:
optional grain value if `name` does not match the one returned by
`oscodename` grain
#}
{# use upstream version if configured #} {# use upstream version if configured #}
{% if repo.use_upstream_repo == true %} {% if repo.use_upstream_repo == true %}
{% set fromrepo = repo.fromrepo or name + '-pgdg' %}
{% set version = repo.version %} {% set version = repo.version %}
{% else %}
{% set fromrepo = name %}
{% endif %} {% endif %}
{{ codename|default(name, true) }}: {{ codename|default(name, true) }}: