Merge pull request #66 from netmanagers/master

fix(preferences,repositories): fix clean parameter
saltstack-formulas · Sep 21, 2020 · 5c68531 · 5c68531
2 parents 7645b15 + 50e02fb
commit 5c68531
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -61,7 +61,7 @@ jobs:
     # - env: INSTANCE=repositories-debian-10-master-py3
     # - env: INSTANCE=preferences-debian-10-master-py3
     # - env: INSTANCE=unattended-debian-10-master-py3
-    - env: INSTANCE=debian-10-master-py3
+    - env: INSTANCE=repositories-debian-10-master-py3
     - env: INSTANCE=repositories-ubuntu-1804-master-py3
     # - env: INSTANCE=preferences-ubuntu-1804-master-py3
     # - env: INSTANCE=unattended-ubuntu-1804-master-py3

diff --git a/apt/apt_conf.sls b/apt/apt_conf.sls
@@ -33,4 +33,6 @@
     - mode: 644
     - context:
         data: {{ contents }}
+    - require_in:
+      - file: {{ confd_dir }}
 {% endfor %}
diff --git a/apt/preferences.sls b/apt/preferences.sls
@@ -42,4 +42,6 @@
       - "{{ 'Explanation: ' ~ explanation }}"
 {% endfor %}
 {% endif %}
+    - require_in:
+      - file: {{ preferences_dir }}
 {% endfor %}
diff --git a/apt/repositories.sls b/apt/repositories.sls
@@ -30,8 +30,6 @@
     - group: root
     - clean: {{ clean_sources_list_d }}
 
-
-
 {% for repo, args in repositories.items() %}
 
 {% set r_opts = '' %}