Skip to content

Commit 7549155

Browse files
authored
Merge pull request #60 from netmanagers/fix-version-typo-on-package-install
Fix version typo on package install
2 parents 7762c85 + eddad91 commit 7549155

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

node/map.jinja

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,3 @@
3939
{%- do node.pkg.repo.update({
4040
'name': full_repo_name}) -%}
4141
{%- endif -%}
42-
43-
## Legacy support (remove on/after Jan 2021) ##
44-
45-
{%- if salt['pillar.get']('node:install_from_ppa') %}
46-
{%- do node.pkg.update({ 'use_upstream_repo': True }) %}
47-
{%- if salt['pillar.get']('node:version') %}
48-
{%- do node.pkg.update({ 'version': salt['pillar.get']('node:version')}) %}
49-
{%- endif %}
50-
{%- endif %}
51-
{%- if salt['pillar.get']('node:install_from_source') %}
52-
{%- do node.pkg.update({ 'use_upstream_source': True }) %}
53-
{%- if salt['pillar.get']('node:checksum') %}
54-
{%- do node.pkg.source.update({ 'source_hash': salt['pillar.get']('node:checksum') }) %}
55-
{%- endif %}
56-
{%- endif %}
57-
{%- if salt['pillar.get']('node:install_from_archive') %}
58-
{%- do node.pkg.update({ 'use_upstream_archive': True }) %}
59-
{%- if salt['pillar.get']('node:checksum') %}
60-
{%- do node.pkg.archive.update({ 'source_hash': salt['pillar.get']('node:checksum') }) %}
61-
{%- endif %}
62-
{%- endif %}

node/package/install.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ node-package-install-pkg-installed:
1818
- reload_modules: true
1919
{%- if salt['pillar.get']('node:pkg:version', '') %}
2020
{# use pkg:version for pinning #}
21-
- version: {{ salt['pillar.get']('node:pkg::version', '') }}
21+
- version: {{ salt['pillar.get']('node:pkg:version', '') }}
2222
{%- endif %}

0 commit comments

Comments
 (0)