From 4b0ec5dc01e0702d85a07d52bf8c5392402806e2 Mon Sep 17 00:00:00 2001
From: Niels Abspoel <aboe76@gmail.com>
Date: Thu, 11 Dec 2014 22:09:21 +0100
Subject: [PATCH] Improved jinja spacing in template

This will make the _defaults.conf file for master and minion
better by removing some empty lines in some code blocks
---
 salt/files/minion.d/_defaults.conf | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/salt/files/minion.d/_defaults.conf b/salt/files/minion.d/_defaults.conf
index 14f6fba..67d4b11 100644
--- a/salt/files/minion.d/_defaults.conf
+++ b/salt/files/minion.d/_defaults.conf
@@ -452,21 +452,21 @@ file_roots:
 # exist in that repo as *local* refs.
 {% if 'gitfs_remotes' in minion -%}
 gitfs_remotes:
-{% for remote in minion['gitfs_remotes'] %}
-{% if remote is mapping %}
-  {% for repo, children in remote.iteritems() %}
+{%- for remote in minion['gitfs_remotes'] %}
+{%- if remote is iterable and remote is not string %}
+  {%- for repo, children in remote.iteritems() %}
     - {{ repo }}:
-  {% for child in children %}
-    {% for key, value in child.iteritems() %}
+  {%- for child in children %}
+    {%- for key, value in child.iteritems() %}
       - {{ key }}: {{ value }}
-    {% endfor %}
-  {% endfor %}
-  {% endfor %}
-  {% else %}
+    {%- endfor -%}
+  {%- endfor -%}
+  {%- endfor -%}
+  {%- else %}
     - {{ remote }}
-{% endif %}
-{% endfor %}
-{% endif %}
+{%- endif -%}
+{%- endfor -%}
+{%- endif -%}
 #
 #gitfs_remotes:
 #  - git://github.com/saltstack/salt-states.git