Merge pull request #158 from irtnog/fix-freebsd-gitpython-package

Use the py27-GitPython package when installing GitPython on FreeBSD
saltstack-formulas · Jul 24, 2015 · e7e77d4 · e7e77d4
2 parents bc0776e + ea5a9f1
commit e7e77d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
@@ -18,6 +18,8 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
+  python_git: python-git
+
   master:
     gitfs_provider: gitpython
 

diff --git a/salt/gitfs/gitpython.sls b/salt/gitfs/gitpython.sls
@@ -8,6 +8,7 @@ GitPython:
 {% else %}
 
 python-git:
-  pkg.installed
+  pkg.installed:
+    - name: {{ salt_settings.python_git }}
 
 {% endif %}
diff --git a/salt/map.jinja b/salt/map.jinja
@@ -49,6 +49,7 @@ that differ from whats in defaults.yaml
       'salt_cloud': 'py27-salt',
       'salt_api': 'py27-salt',
       'salt_ssh': 'py27-salt',
+      'python_git': 'py27-GitPython',
       'config_path': '/usr/local/etc/salt',
       'minion_service': 'salt_minion',
       'master_service': 'salt_master',