mirror of
https://github.com/saltstack-formulas/packages-formula.git
synced 2025-04-16 01:30:22 +00:00
Merge pull request #47 from noelmcloughlin/fixes
pip states broken on python3 [suse 15]
This commit is contained in:
commit
df08216a53
1 changed files with 15 additions and 3 deletions
|
@ -16,9 +16,15 @@ pip_req_pkgs:
|
|||
# (requires the python-pip deb/rpm installed, either by the system or listed in
|
||||
# the required packages
|
||||
{% for pn in wanted_pips %}
|
||||
{{ pn }}:
|
||||
packages pips install {{ pn }}:
|
||||
{%- if grains.os_family in ('Suse',) %} ##workaround https://github.com/saltstack-formulas/docker-formula/issues/198
|
||||
cmd.run:
|
||||
- name: /usr/bin/pip install {{ pn }}
|
||||
{%- else %}
|
||||
pip.installed:
|
||||
- name: {{ pn }}
|
||||
- reload_modules: true
|
||||
{%- endif %}
|
||||
- require:
|
||||
- pkg: pip_req_pkgs
|
||||
{% if req_states %}
|
||||
|
@ -29,6 +35,12 @@ pip_req_pkgs:
|
|||
{% endfor %}
|
||||
|
||||
{% for upn in unwanted_pips %}
|
||||
{{ upn }}:
|
||||
pip.removed
|
||||
packages pips remove {{ upn }}:
|
||||
{%- if grains.os_family in ('Suse',) %}
|
||||
cmd.run:
|
||||
- name: /usr/bin/pip uninstall {{ pn }}
|
||||
{%- else %}
|
||||
pip.removed:
|
||||
- name: {{ upn }}
|
||||
{%- endif %}
|
||||
{% endfor %}
|
||||
|
|
Loading…
Add table
Reference in a new issue