Fix some minor lint issues
This was shown by the testing that was added in merge request !34
This commit is contained in:
parent
354bada721
commit
2bbfe8cab9
3 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
# Install a package with a preseed file to automatically answer some questions.
|
||||||
define apt::preseeded_package (
|
define apt::preseeded_package (
|
||||||
$ensure = 'installed',
|
$ensure = 'installed',
|
||||||
$content = ''
|
$content = ''
|
||||||
|
@ -10,7 +11,9 @@ define apt::preseeded_package (
|
||||||
|
|
||||||
file { $seedfile:
|
file { $seedfile:
|
||||||
content => $real_content,
|
content => $real_content,
|
||||||
mode => '0600', owner => root, group => root,
|
mode => '0600',
|
||||||
|
owner => 'root',
|
||||||
|
group => 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
package { $name:
|
package { $name:
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
# Configure an apt source
|
||||||
define apt::sources_list (
|
define apt::sources_list (
|
||||||
$ensure = 'present',
|
$ensure = 'present',
|
||||||
$source = '',
|
$source = '',
|
||||||
|
@ -22,7 +23,9 @@ define apt::sources_list (
|
||||||
# apparently doesn't.
|
# apparently doesn't.
|
||||||
file { "/etc/apt/sources.list.d/${realname}.list":
|
file { "/etc/apt/sources.list.d/${realname}.list":
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
owner => root, group => 0, mode => '0644',
|
mode => '0644',
|
||||||
|
owner => 'root',
|
||||||
|
group => 0,
|
||||||
notify => Exec['apt_updated'],
|
notify => Exec['apt_updated'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
# Install a package either to a certain version, or while making sure that it's
|
||||||
|
# always the latest version that's installed.
|
||||||
define apt::upgrade_package (
|
define apt::upgrade_package (
|
||||||
$version = ''
|
$version = ''
|
||||||
) {
|
) {
|
||||||
|
@ -23,7 +25,7 @@ define apt::upgrade_package (
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}":
|
exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}":
|
||||||
onlyif => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
|
onlyif => [ "grep-status -F Status installed -a -P ${name} -q", "apt-show-versions -u ${name} | grep -q upgradeable" ],
|
||||||
require => Package['apt-show-versions', 'dctrl-tools'],
|
require => Package['apt-show-versions', 'dctrl-tools'],
|
||||||
before => Exec['apt_updated']
|
before => Exec['apt_updated']
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue