Browse Source

Test if individual gitfs remote is string

https://github.com/saltstack-formulas/salt-formula/issues/64

Fixes issue where a gitfs remote that has no child options would cause an
error. Also fix up bad yaml in pillar example.
tags/v0.57.0
Tiru Srikantha 10 years ago
parent
commit
70b5c981fa
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      pillar.example
  2. +1
    -1
      salt/files/master.d/_defaults.conf

+ 1
- 1
pillar.example View File

- git - git
- roots - roots
gitfs_remotes: gitfs_remotes:
- git://github.com/saltstack-formulas/salt-formula.git
- git://github.com/saltstack-formulas/salt-formula.git:
- base: develop - base: develop
file_roots: file_roots:
base: base:

+ 1
- 1
salt/files/master.d/_defaults.conf View File

{% if 'gitfs_remotes' in master -%} {% if 'gitfs_remotes' in master -%}
gitfs_remotes: gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %} {%- for remote in master['gitfs_remotes'] %}
{% if remote is iterable %}
{% if remote is iterable and remote is not string %}
{%- for repo, children in remote.iteritems() -%} {%- for repo, children in remote.iteritems() -%}
- {{ repo }}: - {{ repo }}:
{%- for child in children %} {%- for child in children %}

Loading…
Cancel
Save