Merge branch 'master' into fixes

This commit is contained in:
N 2018-12-05 16:28:18 +00:00
commit ddad0238b0
No known key found for this signature in database
GPG key ID: 93AFB6C0144D1A90

View file

@ -51,6 +51,11 @@ packages-archive-wanted-download-{{ package }}:
cmd.run: cmd.run:
- name: curl -s -L -o {{ packages.tmpdir }}/{{ archivename }} {{ archive.dl.source }} - name: curl -s -L -o {{ packages.tmpdir }}/{{ archivename }} {{ archive.dl.source }}
- unless: test -f {{ packages.tmpdir }}/{{ archivename }}/ - unless: test -f {{ packages.tmpdir }}/{{ archivename }}/
- retry:
attempts: 5
until: True
interval: 60
splay: 10
{%- if 'hashsum' in archive.dl and archive.dl.hashsum %} {%- if 'hashsum' in archive.dl and archive.dl.hashsum %}
{# see https://github.com/saltstack/salt/pull/41914 #} {# see https://github.com/saltstack/salt/pull/41914 #}