projects
/
arvados-formula.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea03991
)
fix(conditionals): wrong onlyif specification
author
Javier Bértoli <javier@netmanagers.com.ar>
Wed, 12 May 2021 16:11:28 +0000
(13:11 -0300)
committer
Javier Bértoli <javier@netmanagers.com.ar>
Wed, 12 May 2021 16:11:28 +0000
(13:11 -0300)
arvados/api/package/clean.sls
patch
|
blob
|
history
arvados/api/package/install.sls
patch
|
blob
|
history
arvados/ruby/package/clean.sls
patch
|
blob
|
history
arvados/shell/package/clean.sls
patch
|
blob
|
history
arvados/shell/package/install.sls
patch
|
blob
|
history
arvados/workbench/package/clean.sls
patch
|
blob
|
history
arvados/workbench/package/install.sls
patch
|
blob
|
history
diff --git
a/arvados/api/package/clean.sls
b/arvados/api/package/clean.sls
index 52e3650612d571248e703495bd42b92a6cd8ff55..6f9e6201ad52342b6fd240ebd552ce8d9db259d0 100644
(file)
--- a/
arvados/api/package/clean.sls
+++ b/
arvados/api/package/clean.sls
@@
-16,7
+16,7
@@
arvados-api-package-clean-gem-{{ gm }}-removed:
arvados-api-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
arvados-api-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
- - only
_
if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
arvados-api-package-clean-pkg-removed:
pkg.removed:
arvados-api-package-clean-pkg-removed:
pkg.removed:
@@
-25,4
+25,4
@@
arvados-api-package-clean-pkg-removed:
arvados-api-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
arvados-api-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
- - only
_
if: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
diff --git
a/arvados/api/package/install.sls
b/arvados/api/package/install.sls
index 068d4a1afd4d14fcc0025bb9d8b6547b3cbed21a..54e20efe59b8c8247e0e0a875f2f02d3c4679d26 100644
(file)
--- a/
arvados/api/package/install.sls
+++ b/
arvados/api/package/install.sls
@@
-19,7
+19,7
@@
include:
arvados-api-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | unique | json }}
arvados-api-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | unique | json }}
- - only
_
if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
{%- for gm in arvados.api.gem.name | unique %}
arvados-api-package-install-gem-{{ gm }}-installed:
{%- for gm in arvados.api.gem.name | unique %}
arvados-api-package-install-gem-{{ gm }}-installed:
diff --git
a/arvados/ruby/package/clean.sls
b/arvados/ruby/package/clean.sls
index cd5f32a02f662a65262d388ee8656c636fba992d..9fb78afac159492c44cb211242e366393bdfae03 100644
(file)
--- a/
arvados/ruby/package/clean.sls
+++ b/
arvados/ruby/package/clean.sls
@@
-16,7
+16,7
@@
arvados-shell-package-clean-gem-{{ gm }}-removed:
arvados-shell-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
arvados-shell-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
- - only
_
if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
arvados-shell-package-clean-pkg-removed:
pkg.removed:
arvados-shell-package-clean-pkg-removed:
pkg.removed:
@@
-25,4
+25,4
@@
arvados-shell-package-clean-pkg-removed:
arvados-shell-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
arvados-shell-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
- - only
_
if: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
diff --git
a/arvados/shell/package/clean.sls
b/arvados/shell/package/clean.sls
index cd5f32a02f662a65262d388ee8656c636fba992d..9fb78afac159492c44cb211242e366393bdfae03 100644
(file)
--- a/
arvados/shell/package/clean.sls
+++ b/
arvados/shell/package/clean.sls
@@
-16,7
+16,7
@@
arvados-shell-package-clean-gem-{{ gm }}-removed:
arvados-shell-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
arvados-shell-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
- - only
_
if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
arvados-shell-package-clean-pkg-removed:
pkg.removed:
arvados-shell-package-clean-pkg-removed:
pkg.removed:
@@
-25,4
+25,4
@@
arvados-shell-package-clean-pkg-removed:
arvados-shell-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
arvados-shell-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
- - only
_
if: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
diff --git
a/arvados/shell/package/install.sls
b/arvados/shell/package/install.sls
index c5d4206585b2e0e28c16c9c080ba347111172a04..6d1300fe21de5da1065b4c2ca2173e523bb8643b 100644
(file)
--- a/
arvados/shell/package/install.sls
+++ b/
arvados/shell/package/install.sls
@@
-34,7
+34,7
@@
arvados-shell-package-install-pkg-installed:
arvados-shell-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
arvados-shell-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
- - only
_
if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
{%- for gm in arvados.shell.gem.name %}
arvados-shell-package-install-gem-{{ gm }}-installed:
{%- for gm in arvados.shell.gem.name %}
arvados-shell-package-install-gem-{{ gm }}-installed:
diff --git
a/arvados/workbench/package/clean.sls
b/arvados/workbench/package/clean.sls
index fcfd2baca40e2633d649c01d0c340939bcb5b23f..f7970dae1c10e70610a4bfe7912e65f7546ddc1b 100644
(file)
--- a/
arvados/workbench/package/clean.sls
+++ b/
arvados/workbench/package/clean.sls
@@
-8,7
+8,7
@@
arvados-workbench-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
arvados-workbench-package-clean-gems-deps-pkg-removed:
pkg.removed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
- - only
_
if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
arvados-workbench-package-clean-pkg-removed:
pkg.removed:
arvados-workbench-package-clean-pkg-removed:
pkg.removed:
@@
-17,4
+17,4
@@
arvados-workbench-package-clean-pkg-removed:
arvados-workbench-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
arvados-workbench-package-clean-ruby-pkg-removed:
pkg.removed:
- name: {{ arvados.ruby.pkg }}
- - only
_
if: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
diff --git
a/arvados/workbench/package/install.sls
b/arvados/workbench/package/install.sls
index cbda268d967b1a6d1521d74f713b00aed8a8204e..dff47f62b15b0fd61d7d99396a57f4acbce98705 100644
(file)
--- a/
arvados/workbench/package/install.sls
+++ b/
arvados/workbench/package/install.sls
@@
-19,7
+19,7
@@
include:
arvados-workbench-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
arvados-workbench-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
- - only
_
if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+ - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
arvados-workbench-package-install-pkg-installed:
pkg.installed:
arvados-workbench-package-install-pkg-installed:
pkg.installed: