Skip to content

Commit 70d224e

Browse files
committed
fix(repo): check whether pkg_repo is set
1 parent 750d8aa commit 70d224e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

postgres/client/init.sls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{%- endif %}
88
{%- endfor %}
99
10-
{%- if postgres.use_upstream_repo == true %}
10+
{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
1111
include:
1212
- postgres.upstream
1313
{%- endif %}
@@ -16,7 +16,7 @@ include:
1616
postgresql-client-libs:
1717
pkg.installed:
1818
- pkgs: {{ pkgs | json }}
19-
{%- if postgres.use_upstream_repo == true %}
19+
{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
2020
- refresh: True
2121
- require:
2222
- pkgrepo: postgresql-repo

postgres/codenamemap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{% macro fedora_codename(name, version, codename=none) %}
4444

4545
{# use upstream version if configured #}
46-
{% if repo.use_upstream_repo == true %}
46+
{% repo.use_upstream_repo == true %}
4747
{% set version = repo.version %}
4848
{% endif %}
4949

postgres/dev/init.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ postgres_maxfiles_limits_conf:
4949
- group: {{ postgres.group }}
5050
{% endif %}
5151
52-
{% if postgres.use_upstream_repo == 'postgresapp' %}
52+
{% if 'pkg_repo' in postgres and postgres.use_upstream_repo == 'postgresapp' %}
5353
# Shortcut for PostgresApp
5454
postgres-desktop-shortcut-clean:
5555
file.absent:

postgres/python.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ postgresql-python:
99
{% if postgres.fromrepo %}
1010
- fromrepo: {{ postgres.fromrepo }}
1111
{% endif %}
12-
{% if postgres.use_upstream_repo == true %}
12+
{% if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
1313
- refresh: True
1414
- require:
1515
- pkgrepo: postgresql-repo

postgres/server/init.sls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{%- if postgres.bake_image %}
55
{%- do includes.append('postgres.server.image') %}
66
{%- endif %}
7-
{%- if postgres.use_upstream_repo == true -%}
7+
{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true -%}
88
{%- do includes.append('postgres.upstream') %}
99
{%- endif %}
1010
@@ -18,7 +18,7 @@ include:
1818
postgresql-server:
1919
pkg.installed:
2020
- pkgs: {{ pkgs | json }}
21-
{%- if postgres.use_upstream_repo == true %}
21+
{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
2222
- refresh: True
2323
- require:
2424
- pkgrepo: postgresql-repo

0 commit comments

Comments
 (0)