Skip to content

Commit

Permalink
Merge pull request #131 from myii/feat/update-libtofs-jinja
Browse files Browse the repository at this point in the history
feat(libtofs): “files_switch” mess up the variable exported by “map.jinja”
  • Loading branch information
myii authored Feb 14, 2020
2 parents fddf6ae + 634365e commit a40b174
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length rule:quoted-strings
title: "chore(git): add Bundler config dir to '`'.gitignore'`' [skip ci]"
body: '* Checked using https://github.com/myii/ssf-formula/pull/130'
title: "fix(libtofs): “files_switch” mess up the variable exported by “map.jinja” [skip ci]"
body: '* Checked using https://github.com/myii/ssf-formula/pull/131'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down
4 changes: 2 additions & 2 deletions ssf/files/default/formula/libtofs.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'<tplroot>:tofs:files_switch' this is the ordered list of grains to
use as selector switch of the directories under
"<path_prefix>/files"
* indent_witdh: indentation of the result value to conform to YAML
* indent_width: indentation of the result value to conform to YAML
* use_subpath: defaults to `False` but if set, lookup the source file
recursively from the current state directory up to `tplroot`
Expand Down Expand Up @@ -82,7 +82,7 @@
) %}
{#- Append an empty value to evaluate as `default` in the loop below #}
{%- if '' not in fsl %}
{%- do fsl.append('') %}
{%- set fsl = fsl + [''] %}
{%- endif %}
{%- for fs in fsl %}
{%- for src_file in src_files %}
Expand Down
4 changes: 2 additions & 2 deletions ssf/libtofs.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'<tplroot>:tofs:files_switch' this is the ordered list of grains to
use as selector switch of the directories under
"<path_prefix>/files"
* indent_witdh: indentation of the result value to conform to YAML
* indent_width: indentation of the result value to conform to YAML
* use_subpath: defaults to `False` but if set, lookup the source file
recursively from the current state directory up to `tplroot`
Expand Down Expand Up @@ -82,7 +82,7 @@
) %}
{#- Append an empty value to evaluate as `default` in the loop below #}
{%- if '' not in fsl %}
{%- do fsl.append('') %}
{%- set fsl = fsl + [''] %}
{%- endif %}
{%- for fs in fsl %}
{%- for src_file in src_files %}
Expand Down

0 comments on commit a40b174

Please # to comment.