Merge remote-tracking branch 'remotes/origin/master' into nadir_master

Conflicts:
	README
	files/50unattended-upgrades
	files/lenny/50unattended-upgrades
	files/squeeze/50unattended-upgrades
	manifests/dist_upgrade.pp
	manifests/init.pp
	manifests/upgrade_package.pp

1 files changed, 14 insertions, 11 deletions

diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index d831934..9bca8b1 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,18 +1,21 @@
-define apt::preseeded_package ($content = "", $ensure = "installed") {
-  $seedfile = "/var/cache/local/preseeding/$name.seeds"
-  $real_content = $content ? { 
-    ""      => template ( "site_apt/$lsbdistcodename/$name.seeds" ),
+define apt::preseeded_package (
+  $ensure = 'installed',
+  $content = ''
+) {
+  $seedfile = "/var/cache/local/preseeding/${name}.seeds"
+  $real_content = $content ? {
+    ''      => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ),
     default => $content
-  }   
+  }
 
   file { $seedfile:
     content => $real_content,
-    mode => 0600, owner => root, group => root,
-  }   
+    mode    => '0600', owner => root, group => root,
+  }
 
   package { $name:
-    ensure => $ensure,
+    ensure       => $ensure,
     responsefile => $seedfile,
-    require => File[$seedfile],
-  }   
-}  
+    require      => File[$seedfile],
+  }
+}