Skip to content

Fix imports using tplroot #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix imports using tplroot #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ab915c
add tplroot on every import
fragionghi Sep 21, 2021
9ea052a
remove required packages "chocolatey"
fragionghi Sep 21, 2021
b2a342c
tlproot fix
fragionghi Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/archives.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{%- from "./map.jinja" import packages with context %}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import packages with context %}

{%- set wanted_archives = packages.archives.required.archives %}
{%- do wanted_archives.update( packages.archives.wanted ) %}
Expand Down
3 changes: 2 additions & 1 deletion packages/chocolatey.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{%- from "./map.jinja" import packages with context %}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import packages with context %}

{%- if grains['os'] == 'Windows' %}

Expand Down
9 changes: 5 additions & 4 deletions packages/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-
# vim: ft=jinja
{%- set tplroot = tpldir.split('/')[0] %}

{%- import_yaml './defaults.yaml' as defaults %}
{%- import_yaml './osfamilymap.yaml' as osfamilymap %}
{%- import_yaml './osmap.yaml' as osmap %}
{%- import_yaml './osfingermap.yaml' as osfingermap %}
{%- import_yaml tplroot ~ '/defaults.yaml' as defaults %}
{%- import_yaml tplroot ~ '/osfamilymap.yaml' as osfamilymap %}
{%- import_yaml tplroot ~ '/osmap.yaml' as osmap %}
{%- import_yaml tplroot ~ '/osfingermap.yaml' as osfingermap %}

{%- set packages = salt['grains.filter_by'](
defaults,
Expand Down
3 changes: 2 additions & 1 deletion packages/npms.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{%- from "./map.jinja" import packages with context %}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import packages with context %}

{%- set req_states = packages.npms.required.states %}
{%- set req_pkgs = packages.npms.required.pkgs %}
Expand Down
3 changes: 2 additions & 1 deletion packages/pkgs.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

{%- from "./map.jinja" import packages with context %}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import packages with context %}

{%- set req_states = packages.pkgs.required.states %}
{%- set req_packages = packages.pkgs.required.pkgs %}
Expand Down
3 changes: 2 additions & 1 deletion packages/remote_pkgs.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

{%- from "./map.jinja" import packages with context %}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import packages with context %}

{%- set wanted_rem_pkgs = packages.remote_pkgs %}

Expand Down
4 changes: 3 additions & 1 deletion packages/snaps.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
{%- from "./map.jinja" import packages with context %}

{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import packages with context %}

# As we are 'extend'ing pkg_req_pkgs and unwanted_pkgs, we need to concatenate
# the attributes correctly (see #17)
Expand Down