opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #57 from nanliu/tb/style

Browse source 
Fix style related issues in module.
This commit is contained in:
Dan Bode 2012-05-08 11:07:46 -07:00
commit f8cc762122
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifests/key.pp
View file

@ -29,14 +29,14 @@ define apt::key (
case $ensure {
present: {
anchor { "apt::key/${title}":; }
anchor { "apt::key/${title}": }
if defined(Exec["apt::key ${upkey} absent"]) {
fail("Cannot ensure Apt::Key[${upkey}] present; ${upkey} already ensured absent")
}
if !defined(Anchor["apt::key ${upkey} present"]) {
anchor { "apt::key ${upkey} present":; }
anchor { "apt::key ${upkey} present": }
}
if !defined(Exec[$digest]) {

7
manifests/ppa.pp
View file

@ -15,10 +15,9 @@ define apt::ppa(
fail('lsbdistcodename fact not available: release parameter required')
}
$filename_without_slashes = regsubst($name,'/','-','G')
$filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
$filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
$sources_list_d_filename = "${filename_without_ppa}-${release}.list"
if ! defined(Package['python-software-properties']) {
package { 'python-software-properties': }
@ -33,7 +32,7 @@ define apt::ppa(
file { "${sources_list_d}/${sources_list_d_filename}":
ensure => file,
require => Exec["add-apt-repository-${name}"];
require => Exec["add-apt-repository-${name}"],
}
# Need anchor to provide containment for dependencies.