projects
/
arvados-formula.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0bb9afb
)
fix(repo): distro/release are not always the same
author
Javier Bértoli <javier@netmanagers.com.ar>
Fri, 22 Jan 2021 17:01:27 +0000
(14:01 -0300)
committer
Javier Bértoli <javier@netmanagers.com.ar>
Tue, 27 Apr 2021 14:05:26 +0000
(11:05 -0300)
arvados/repo/install.sls
patch
|
blob
|
history
diff --git
a/arvados/repo/install.sls
b/arvados/repo/install.sls
index 41df68bbad873d0d0c6b925e76dcfd8975a477d9..cd42aaa9afb7a20bd366001d6250bfc4f7ba9585 100644
(file)
--- a/
arvados/repo/install.sls
+++ b/
arvados/repo/install.sls
@@
-7,17
+7,19
@@
{%- if arvados.use_upstream_repo %}
{%- if grains.get('os_family') == 'Debian' %}
{%- if arvados.use_upstream_repo %}
{%- if grains.get('os_family') == 'Debian' %}
+ {%- set distro = grains.get('lsb_distrib_codename') %}
+
{%- if arvados.release == 'testing' %}
{%- if arvados.release == 'testing' %}
- {%- set release =
grains.get('lsb_distrib_codename')
~ '-testing' %}
+ {%- set release =
distro
~ '-testing' %}
{%- elif arvados.release == 'development' %}
{%- elif arvados.release == 'development' %}
- {%- set release =
grains.get('lsb_distrib_codename')
~ '-dev' %}
+ {%- set release =
distro
~ '-dev' %}
{%- else %}
{%- else %}
- {%- set release =
grains.get('lsb_distrib_codename')
%}
+ {%- set release =
distro
%}
{%- endif %}
arvados-repo-install-pkgrepo-managed:
pkgrepo.managed:
- humanname: {{ arvados.repo.humanname }}
{%- endif %}
arvados-repo-install-pkgrepo-managed:
pkgrepo.managed:
- humanname: {{ arvados.repo.humanname }}
- - name: deb {{ arvados.repo.url_base }}/{{
release
}} {{ release }} main
+ - name: deb {{ arvados.repo.url_base }}/{{
distro
}} {{ release }} main
- file: {{ arvados.repo.file }}
- key_url: {{ arvados.repo.key_url }}
- file: {{ arvados.repo.file }}
- key_url: {{ arvados.repo.key_url }}