Skip to content

Commit 1b12b49

Browse files
chore(cleanup): remove unnecessary comments
1 parent 9fd18ca commit 1b12b49

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

golang/map.jinja

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=jinja
33

4-
{#- Get the `tplroot` from `tpldir` #}
54
{%- set tplroot = tpldir.split('/')[0] %}
6-
{#- Start imports as #}
75
{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
86
{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
97
{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
108
{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap %}
119
{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}
1210

13-
{#- Retrieve the config dict only once #}
1411
{%- set _config = salt['config.get'](tplroot, default={}) %}
1512

1613
{%- set defaults = salt['grains.filter_by'](
@@ -47,7 +44,6 @@
4744
%}
4845
{%- set golang = config %}
4946

50-
{#- Post-processing for specific non-YAML customisations #}
5147
{%- do golang.update({'kernel': grains.kernel | lower}) %}
5248
{%- if grains.os == 'MacOS' %}
5349
{%- set macos_user = salt['cmd.run']("stat -f '%Su' /dev/console") %}
@@ -58,7 +54,6 @@
5854
}) %}
5955
{%- endif %}
6056

61-
{#- archive jinja #}
6257
{%- if golang.pkg.use_upstream_archive %}
6358
{%- set name = 'go%s.%s-%s'|format(golang.version, golang.kernel, golang.arch) %}
6459
{%- set uri = golang.pkg.archive.uri + '/' + name %}
@@ -72,7 +67,7 @@
7267
{%- do golang.environ.append('export PATH=${PATH}:%s/go/bin'|format(golang.pkg.archive.name)) %}
7368
{%- endif %}
7469

75-
{#- Post-processing for specific YAML keys depreciated in a major releases #}
70+
{#- Depreciated parameter 'golang.dir' %}
7671
{%- if 'dir' in golang and golang.dir and golang.kernel == 'linux' %}
7772
{%- do golang.linux.update({'dir': golang.dir}) %}
7873
{%- endif %}

0 commit comments

Comments
 (0)