From 3c29a3e46f8f6caa2cb25f951f8a1ca71f065fa6 Mon Sep 17 00:00:00 2001
From: teankie <remcomank@eleven.nl>
Date: Tue, 15 Nov 2022 09:38:58 +0100
Subject: [PATCH] Update upstream.sls

Changes for bug 327: postgresql-common conflicts with pgdg-keyring
---
 postgres/upstream.sls | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/postgres/upstream.sls b/postgres/upstream.sls
index 239f151f..83042be1 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: