fix(repo): check whether pkg_repo is set

saltstack-formulas · Feb 26, 2021 · 70d224e · 70d224e
1 parent 750d8aa
commit 70d224e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/postgres/client/init.sls b/postgres/client/init.sls
@@ -7,7 +7,7 @@
   {%- endif %}
 {%- endfor %}
 
-{%- if postgres.use_upstream_repo == true %}
+{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
 include:
   - postgres.upstream
 {%- endif %}
@@ -16,7 +16,7 @@ include:
 postgresql-client-libs:
   pkg.installed:
     - pkgs: {{ pkgs | json }}
-  {%- if postgres.use_upstream_repo == true %}
+  {%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
     - refresh: True
     - require:
       - pkgrepo: postgresql-repo

diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
@@ -43,7 +43,7 @@
 {% macro fedora_codename(name, version, codename=none) %}
 
   {# use upstream version if configured #}
-  {% if repo.use_upstream_repo == true %}
+  {%  repo.use_upstream_repo == true %}
     {% set version = repo.version %}
   {% endif %}
 

diff --git a/postgres/dev/init.sls b/postgres/dev/init.sls
@@ -49,7 +49,7 @@ postgres_maxfiles_limits_conf:
     - group: {{ postgres.group }}
   {% endif %}
 
-  {% if postgres.use_upstream_repo == 'postgresapp' %}
+  {% if 'pkg_repo' in postgres and postgres.use_upstream_repo == 'postgresapp' %}
   # Shortcut for PostgresApp
 postgres-desktop-shortcut-clean:
   file.absent:

diff --git a/postgres/python.sls b/postgres/python.sls
@@ -9,7 +9,7 @@ postgresql-python:
   {% if postgres.fromrepo %}
     - fromrepo: {{ postgres.fromrepo }}
   {% endif %}
-  {% if postgres.use_upstream_repo == true %}
+  {% if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
     - refresh: True
     - require:
       - pkgrepo: postgresql-repo

diff --git a/postgres/server/init.sls b/postgres/server/init.sls
@@ -4,7 +4,7 @@
 {%- if postgres.bake_image %}
   {%- do includes.append('postgres.server.image') %}
 {%- endif %}
-{%- if postgres.use_upstream_repo == true -%}
+{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true -%}
   {%- do includes.append('postgres.upstream') %}
 {%- endif %}
 
@@ -18,7 +18,7 @@ include:
 postgresql-server:
   pkg.installed:
     - pkgs: {{ pkgs | json }}
-{%- if postgres.use_upstream_repo == true %}
+{%- if 'pkg_repo' in postgres and postgres.use_upstream_repo == true %}
     - refresh: True
     - require:
       - pkgrepo: postgresql-repo