Skip to content

Commit

Permalink
fix(pips.sls): use tplroot instead of slspath
Browse files Browse the repository at this point in the history
* Evaluates wrongly on Debian to `salt://packages/pips/files/pip.conf`
  - https://travis-ci.org/myii/packages-formula/jobs/636188022#L7867
  • Loading branch information
myii committed Jan 16, 2020
1 parent 16c4213 commit a4e9311
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions packages/pips.sls
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{% from "packages/map.jinja" import packages with context %}

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import packages with context %}
{% set req_states = packages.pips.required.states %}
{% set req_pkgs = packages.pips.required.pkgs %}
Expand All @@ -24,7 +27,7 @@ pip_req_pkgs:
pip_config:
file.managed:
- name: /etc/pip.conf
- source: salt://{{ slspath }}/files/pip.conf
- source: salt://{{ tplroot }}/files/pip.conf
- template: jinja
- makedirs: True
- context:
Expand Down

0 comments on commit a4e9311

Please sign in to comment.