From ab6b97e8c3ff40f9cb2e629c3c0faf09ca59ede9 Mon Sep 17 00:00:00 2001
From: Julien Levieil <julien.levieil@skazy.nc>
Date: Tue, 29 Sep 2020 10:55:31 +1100
Subject: [PATCH] fix(upstream): require_in/require use_upstream

---
 postgres/server/init.sls | 2 --
 postgres/upstream.sls    | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index ce1d5753..c6f15305 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -20,8 +20,6 @@ postgresql-server:
     - pkgs: {{ pkgs | json }}
 {%- if postgres.use_upstream_repo == true %}
     - refresh: True
-    - require:
-      - pkgrepo: postgresql-repo
 {%- endif %}
   {%- if postgres.fromrepo %}
     - fromrepo: {{ postgres.fromrepo }}
diff --git a/postgres/upstream.sls b/postgres/upstream.sls
index 0fe9ff9c..db108ee4 100644
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -28,6 +28,8 @@ postgresql-repo:
     {{- format_kwargs(postgres.pkg_repo) }}
     - require:
       - pkg: postgresql-pkg-deps
+    - require_in:
+      - pkg: postgresql-server
 
   {%- else -%}