karel/postgres-formula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #300 from jle35/require/pkgrepo

Browse Source 
fix(upstream): require_in/require use_upstream
This commit is contained in:
sticky-note
2020-09-29 12:11:32 +11:00
committed by GitHub
parent 50808e8efe ab6b97e8c3
commit a53b921663
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/server/init.sls
View File

@@ -20,8 +20,6 @@ postgresql-server:
- pkgs: {{ pkgs | json }} - pkgs: {{ pkgs | json }}
{%- if postgres.use_upstream_repo == true %} {%- if postgres.use_upstream_repo == true %}
- refresh: True - refresh: True
- require:
- pkgrepo: postgresql-repo
{%- endif %} {%- endif %}
{%- if postgres.fromrepo %} {%- if postgres.fromrepo %}
- fromrepo: {{ postgres.fromrepo }} - fromrepo: {{ postgres.fromrepo }}

2
postgres/upstream.sls
View File

@@ -28,6 +28,8 @@ postgresql-repo:
{{- format_kwargs(postgres.pkg_repo) }} {{- format_kwargs(postgres.pkg_repo) }}
- require: - require:
- pkg: postgresql-pkg-deps - pkg: postgresql-pkg-deps
- require_in:
- pkg: postgresql-server
{%- else -%} {%- else -%}