Skip to content

Commit a7f382f

Browse files
committed
fix(clean): update enable_repo condition to be more robust
1 parent 53db7ad commit a7f382f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docker/software/package/clean.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{%- set formula = d.formula %}
77
88
{%- if d.pkg.docker.use_upstream in ('package', 'repo') %}
9-
{%- set enable_repo = grains.os_family in ('RedHat', 'Debian') %}
9+
{%- set enable_repo = grains.os_family in ('RedHat', 'Debian') and d.pkg.docker.get('repo') %}
1010
{%- if enable_repo %}
1111
{%- set sls_repo_clean = tplroot ~ '.software.package.repo.clean' %}
1212
include:

docker/software/package/install.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{%- set formula = d.formula %}
77
88
{%- if d.pkg.docker.use_upstream in ('package', 'repo') %}
9-
{%- set enable_repo = grains.os_family in ('RedHat', 'Debian') %}
9+
{%- set enable_repo = grains.os_family in ('RedHat', 'Debian') and d.pkg.docker.get('repo') %}
1010
{%- set docker_pkg_version = d.version | default(d.pkg.version, true) %}
1111
{%- if enable_repo %}
1212
{%- set sls_repo_install = tplroot ~ '.software.package.repo.install' %}

0 commit comments

Comments
 (0)