Skip to content

Commit e3b28da

Browse files
committed
puppet-lint: autofix
1 parent 153e35c commit e3b28da

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

manifests/init.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
# Set default umask.
7676
exec { default:
77-
umask => $umask
77+
umask => $umask,
7878
}
7979

8080
# Allow hiera configuration of python resources

manifests/pip.pp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -204,20 +204,16 @@
204204
# Unfortunately this is the smartest way of getting the latest available package version with pip as of now
205205
# Note: we DO need to repeat ourselves with "from version" in both grep and sed as on some systems pip returns
206206
# more than one line with paretheses.
207-
$latest_version = join(
208-
["${pip_install} ${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${real_pkgname}==notreallyaversion 2>&1",
209-
' | grep -oP "\(from versions: .*\)" | sed -E "s/\(from versions: (.*?, )*(.*)\)/\2/g"',
210-
' | tr -d "[:space:]"',]
211-
)
207+
$latest_version = join( [
208+
"${pip_install} ${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${real_pkgname}==notreallyaversion 2>&1",
209+
' | grep -oP "\(from versions: .*\)" | sed -E "s/\(from versions: (.*?, )*(.*)\)/\2/g"',
210+
' | tr -d "[:space:]"',
211+
])
212212

213213
# Packages with underscores in their names are listed with dashes in their place in `pip freeze` output
214214
$pkgname_with_dashes = regsubst($real_pkgname, '_', '-', 'G')
215215
$grep_regex_pkgname_with_dashes = "^${pkgname_with_dashes}=="
216-
$installed_version = join(
217-
["${pip_env} freeze --all",
218-
" | grep -i -e ${grep_regex_pkgname_with_dashes} | cut -d= -f3",
219-
" | tr -d '[:space:]'",]
220-
)
216+
$installed_version = join( ["${pip_env} freeze --all", " | grep -i -e ${grep_regex_pkgname_with_dashes} | cut -d= -f3", " | tr -d '[:space:]'",])
221217

222218
$command = "${pip_install} --upgrade ${pip_common_args}"
223219
$unless_command = "[ \$(${latest_version}) = \$(${installed_version}) ]"

0 commit comments

Comments
 (0)