From: Nan Liu Date: Tue, 8 May 2012 17:47:43 +0000 (-0700) Subject: Fix style related issues in module. X-Git-Tag: 0.0.4~14^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=322f3b68e780d16ec676992233589c43b65b91db;p=puppet-modules%2Fpuppetlabs-apt.git Fix style related issues in module. --- diff --git a/manifests/key.pp b/manifests/key.pp index e87968d..037eec5 100644 --- a/manifests/key.pp +++ b/manifests/key.pp @@ -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]) { diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 7800d3d..578c81d 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -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.