Merge pull request #7 from elemoine/salt-version-test
[WIP] Fix the saltversion test
diff --git a/salt/master/env.sls b/salt/master/env.sls
index 3822667..a486b99 100644
--- a/salt/master/env.sls
+++ b/salt/master/env.sls
@@ -153,12 +153,12 @@
- target: /usr/share/salt-formulas/env/_formulas/{{ formula_name }}
{% if formula.get("revision", "").split("/")[0] == "refs" %}
- rev: {{ formula.branch|default("master") }}
- {%- if grains['saltversion'] < "2015.8.0" %}
+ {%- if grains['saltversion'] >= "2015.8.0" %}
- branch: {{ formula.branch|default("master") }}
{%- endif %}
{% else %}
- rev: {{ formula.revision|default(formula.branch) }}
- {%- if grains['saltversion'] < "2015.8.0" %}
+ {%- if grains['saltversion'] >= "2015.8.0" %}
- branch: {{ formula.branch|default(formula.revision) }}
{%- endif %}
{% endif %}