From 12666c3b132521cbc0ff2bd65a77b49670e9c7d0 Mon Sep 17 00:00:00 2001 From: teankie Date: Thu, 9 Feb 2023 11:17:56 +0100 Subject: [PATCH] fix(upstream): install keyring only in old versions Solves #327: postgresql-common conflicts with pgdg-keyring Co-authored-by: teankie --- postgres/upstream.sls | 3 +++ 1 file changed, 3 insertions(+) diff --git a/postgres/upstream.sls b/postgres/upstream.sls index 239f151..83042be 100644 --- a/postgres/upstream.sls +++ b/postgres/upstream.sls @@ -2,6 +2,7 @@ {%- from tpldir + "/macros.jinja" import format_kwargs with context -%} {%- if 'pkg_repo' in postgres -%} +{% set pg_common_version = salt['pkg.version']('postgresql-common') %} {%- if postgres.use_upstream_repo == true -%} @@ -24,6 +25,7 @@ postgresql-pkg-deps: # Add upstream repository for your distro {% if grains.os_family == 'Debian' %} + {% if salt['pkg.version_cmp'](pg_common_version, '246') <= 0 %} postgresql-repo-keyring: pkg.installed: - sources: @@ -31,6 +33,7 @@ postgresql-repo-keyring: - require_in: - pkgrepo: postgresql-repo {%- endif %} + {%- endif %} postgresql-repo: pkgrepo.managed: