Skip to content

Commit 89fc614

Browse files
committed
(maint) puppet-lint trailing_comma check
1 parent 3122a21 commit 89fc614

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

manifests/install/darwin.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
file { $_installsh:
2626
ensure => file,
2727
mode => '0755',
28-
content => template('puppet_agent/do_install.sh.erb')
28+
content => template('puppet_agent/do_install.sh.erb'),
2929
}
3030
-> exec { 'osx_install script':
3131
command => "${_installsh} ${::puppet_agent_pid} 2>&1 > ${_logfile} &",

manifests/install/solaris.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
file { $_installsh:
4242
ensure => file,
4343
mode => '0755',
44-
content => template('puppet_agent/do_install.sh.erb')
44+
content => template('puppet_agent/do_install.sh.erb'),
4545
}
4646
-> exec { 'solaris_install script':
4747
command => "/usr/bin/ctrun -l none ${_installsh} ${::puppet_agent_pid} 2>&1 > ${_logfile} &",

manifests/install/windows.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,20 @@
6666
$_helpers = windows_native_path("${::env_temp_variable}/helpers.ps1")
6767
file { $_helpers:
6868
ensure => file,
69-
content => file('puppet_agent/helpers.ps1')
69+
content => file('puppet_agent/helpers.ps1'),
7070
}
7171

7272
$_installps1 = windows_native_path("${::env_temp_variable}/install_puppet.ps1")
7373
puppet_agent_upgrade_error { 'puppet_agent_upgrade_failure.log': }
7474
file { $_installps1:
7575
ensure => file,
76-
content => file('puppet_agent/install_puppet.ps1')
76+
content => file('puppet_agent/install_puppet.ps1'),
7777
}
7878

7979
$_prerequisites_check = windows_native_path("${::env_temp_variable}/prerequisites_check.ps1")
8080
file { $_prerequisites_check:
8181
ensure => file,
82-
content => file('puppet_agent/prerequisites_check.ps1')
82+
content => file('puppet_agent/prerequisites_check.ps1'),
8383
}
8484

8585
exec { 'prerequisites_check.ps1':
@@ -89,7 +89,7 @@
8989
-NoLogo \
9090
-NonInteractive \
9191
${_prerequisites_check} ${::puppet_agent::_expected_package_version} ${_msi_location} ${_logfile}",
92-
require => File[$_prerequisites_check]
92+
require => File[$_prerequisites_check],
9393
}
9494

9595
exec { 'install_puppet.ps1':
@@ -126,8 +126,8 @@
126126
require => [
127127
Puppet_agent_upgrade_error['puppet_agent_upgrade_failure.log'],
128128
File[$_installps1],
129-
Exec['prerequisites_check.ps1']
130-
]
129+
Exec['prerequisites_check.ps1'],
130+
],
131131
}
132132

133133
# PUP-5480/PE-15037 Cache dir loses inheritable SYSTEM perms

manifests/prepare/package.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
group => $::puppet_agent::params::group,
3333
mode => $mode,
3434
source => $source,
35-
require => File[$::puppet_agent::params::local_packages_dir],
36-
checksum => sha256lite
35+
require => File[$puppet_agent::params::local_packages_dir],
36+
checksum => sha256lite,
3737
}
3838
}

manifests/prepare/puppet_config.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# (minimum agent package version) => (list of deprecated settings)
1818
$_deprecations = {
1919
'1.4.0' => ['pluginsync'],
20-
'5.0.0' => ['app_management', 'ignorecache', 'configtimeout', 'trusted_server_facts']
20+
'5.0.0' => ['app_management', 'ignorecache', 'configtimeout', 'trusted_server_facts'],
2121
}
2222

2323
$_pkg_version = getvar('package_version')

0 commit comments

Comments
 (0)