Browse Source

Merge pull request #460 from noelmcloughlin/version_cmp

fix(jinja): replace version_cmp with grains lookup
tags/v1.3.1
Imran Iqbal 4 years ago
parent
commit
7551ba5b0e
No account linked to committer's email address
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      salt/formulas.sls
  2. +1
    -1
      test/integration/v201902-py3/controls/pkgs_spec.rb

+ 2
- 2
salt/formulas.sls View File

@@ -34,7 +34,7 @@
{%- do processed_basedirs.append(basedir) %}
{{ basedir }}:
file.directory:
- parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }}
- parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }}
{%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts',
{'makedirs': True}).items() %}
- {{ key }}: {{ value }}
@@ -54,7 +54,7 @@
{{ gitdir_env }}:
git.latest:
- name: {{ baseurl }}/{{ f_name }}.git
- parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }}
- parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }}
- target: {{ gitdir }}
{%- for key, value in options.items() %}
- {{ key }}: {{ value }}

+ 1
- 1
test/integration/v201902-py3/controls/pkgs_spec.rb View File

@@ -12,7 +12,7 @@ version =
when 'fedora'
'2019.2.1rc0-3.fc31'
when 'suse'
'2019.2.0-lp151.5.9.1'
'2019.2.0-lp151.5.12.1'
when 'debian'
'2019.2.3+ds-1'
end

Loading…
Cancel
Save