Merge pull request #169 from rhertzog/gitconfig
Do not try to run git config when git is not available
This commit is contained in:
commit
e05d551ac6
@ -446,10 +446,6 @@ users_googleauth-{{ svc }}-{{ name }}:
|
|||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
#
|
|
||||||
# if not salt['cmd.has_exec']('git')
|
|
||||||
# fails even if git is installed
|
|
||||||
#
|
|
||||||
# this doesn't work (Salt bug), therefore need to run state.apply twice
|
# this doesn't work (Salt bug), therefore need to run state.apply twice
|
||||||
#include:
|
#include:
|
||||||
# - users
|
# - users
|
||||||
@ -460,6 +456,7 @@ users_googleauth-{{ svc }}-{{ name }}:
|
|||||||
# - sls: users
|
# - sls: users
|
||||||
#
|
#
|
||||||
{% if 'gitconfig' in user %}
|
{% if 'gitconfig' in user %}
|
||||||
|
{% if salt['cmd.has_exec']('git') %}
|
||||||
{% for key, value in user['gitconfig'].items() %}
|
{% for key, value in user['gitconfig'].items() %}
|
||||||
users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
|
users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
|
||||||
{% if grains['saltversioninfo'] >= [2015, 8, 0, 0] %}
|
{% if grains['saltversioninfo'] >= [2015, 8, 0, 0] %}
|
||||||
@ -477,6 +474,7 @@ users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user