From abe828663efadf1696ace0e2288a405116b759f3 Mon Sep 17 00:00:00 2001
From: Robin Schneider <36660054+ypid-geberit@users.noreply.github.com>
Date: Mon, 14 Jun 2021 16:59:19 +0200
Subject: [PATCH] refactor(includes): Use relative state include

Allow to rename the formula so it does not collide with others with the same name
(ie, SUSE Manager's)
---
 packages/archives.sls    |  4 ++--
 packages/chocolatey.sls  |  2 +-
 packages/init.sls        | 18 +++++++++---------
 packages/map.jinja       |  8 ++++----
 packages/npms.sls        |  2 +-
 packages/pkgs.sls        |  2 +-
 packages/remote_pkgs.sls |  2 +-
 packages/snaps.sls       |  4 ++--
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/archives.sls b/packages/archives.sls
index 88b2801..553ca42 100644
--- a/packages/archives.sls
+++ b/packages/archives.sls
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- from "packages/map.jinja" import packages with context %}
+{%- from "./map.jinja" import packages with context %}
 
 {%- set wanted_archives = packages.archives.required.archives %}
 {%- do wanted_archives.update( packages.archives.wanted ) %}
@@ -10,7 +10,7 @@
 
 {%- set req_packages = packages.pkgs.required.pkgs + packages.archives.pkgs.required %}
 include:
-  - packages.pkgs
+  - .pkgs
 
 extend:
   pkg_req_pkgs:
diff --git a/packages/chocolatey.sls b/packages/chocolatey.sls
index 9c9265f..a673680 100644
--- a/packages/chocolatey.sls
+++ b/packages/chocolatey.sls
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- from "packages/map.jinja" import packages with context %}
+{%- from "./map.jinja" import packages with context %}
 
 {%- if grains['os'] == 'Windows' %}
 
diff --git a/packages/init.sls b/packages/init.sls
index 763e752..cc7abc2 100644
--- a/packages/init.sls
+++ b/packages/init.sls
@@ -2,12 +2,12 @@
 # vim: ft=sls
 
 include:
-  - packages.pkgs
-  - packages.remote_pkgs
-  - packages.pips
-  - packages.gems
-  - packages.npms
-  - packages.archives
-  - packages.snaps
-  - packages.golang
-  - packages.chocolatey
+  - .pkgs
+  - .remote_pkgs
+  - .pips
+  - .gems
+  - .npms
+  - .archives
+  - .snaps
+  - .golang
+  - .chocolatey
diff --git a/packages/map.jinja b/packages/map.jinja
index 7dd78d2..569389f 100644
--- a/packages/map.jinja
+++ b/packages/map.jinja
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # vim: ft=jinja
 
-{%- import_yaml 'packages/defaults.yaml' as defaults %}
-{%- import_yaml 'packages/osfamilymap.yaml' as osfamilymap %}
-{%- import_yaml 'packages/osmap.yaml' as osmap %}
-{%- import_yaml 'packages/osfingermap.yaml' as osfingermap %}
+{%- import_yaml './defaults.yaml' as defaults %}
+{%- import_yaml './osfamilymap.yaml' as osfamilymap %}
+{%- import_yaml './osmap.yaml' as osmap %}
+{%- import_yaml './osfingermap.yaml' as osfingermap %}
 
 {%- set packages = salt['grains.filter_by'](
     defaults,
diff --git a/packages/npms.sls b/packages/npms.sls
index b1a9768..78d60a8 100644
--- a/packages/npms.sls
+++ b/packages/npms.sls
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- from "packages/map.jinja" import packages with context %}
+{%- from "./map.jinja" import packages with context %}
 
 {%- set req_states = packages.npms.required.states %}
 {%- set req_pkgs = packages.npms.required.pkgs %}
diff --git a/packages/pkgs.sls b/packages/pkgs.sls
index 2be9658..418606f 100644
--- a/packages/pkgs.sls
+++ b/packages/pkgs.sls
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{%- from "packages/map.jinja" import packages with context %}
+{%- from "./map.jinja" import packages with context %}
 
 {%- set req_states = packages.pkgs.required.states %}
 {%- set req_packages = packages.pkgs.required.pkgs %}
diff --git a/packages/remote_pkgs.sls b/packages/remote_pkgs.sls
index e37a46c..dbbd0b0 100644
--- a/packages/remote_pkgs.sls
+++ b/packages/remote_pkgs.sls
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{%- from "packages/map.jinja" import packages with context %}
+{%- from "./map.jinja" import packages with context %}
 
 {%- set wanted_rem_pkgs = packages.remote_pkgs %}
 
diff --git a/packages/snaps.sls b/packages/snaps.sls
index 0bf2751..d1a61a1 100644
--- a/packages/snaps.sls
+++ b/packages/snaps.sls
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- from "packages/map.jinja" import packages with context %}
+{%- from "./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)
@@ -17,7 +17,7 @@
 
 ### REQ PKGS (without this, SNAPS can fail to install/uninstall)
 include:
-  - packages.pkgs
+  - .pkgs
   {%- if req_states %}
     {%- for dep in req_states %}
   - {{ dep }}