From 70b5c981faa87d0c56975f7acaa5503ec620cea4 Mon Sep 17 00:00:00 2001
From: Tiru Srikantha <tiru@playfab.com>
Date: Wed, 12 Nov 2014 20:32:43 -0800
Subject: [PATCH] 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.
---
 pillar.example                     | 2 +-
 salt/files/master.d/_defaults.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pillar.example b/pillar.example
index 1baebc6..19dfaea 100644
--- a/pillar.example
+++ b/pillar.example
@@ -4,7 +4,7 @@ salt:
       - git
       - roots
     gitfs_remotes:
-      - git://github.com/saltstack-formulas/salt-formula.git
+      - git://github.com/saltstack-formulas/salt-formula.git:
         - base: develop
     file_roots:
       base:
diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf
index c578eb9..1c9c489 100644
--- a/salt/files/master.d/_defaults.conf
+++ b/salt/files/master.d/_defaults.conf
@@ -486,7 +486,7 @@ fileserver_backend:
 {% if 'gitfs_remotes' 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() -%}
     - {{ repo }}:
   {%- for child in children %}