From 9493b62187b814e872eb27f4a6a18c53b5076906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= <pollito@riseup.net>
Date: Thu, 22 Dec 2016 21:25:13 -0500
Subject: indent packages correctly

---
 manifests/apticron.pp            | 4 +++-
 manifests/cron/dist_upgrade.pp   | 8 ++++++--
 manifests/dselect.pp             | 4 +++-
 manifests/init.pp                | 4 +++-
 manifests/listchanges.pp         | 4 +++-
 manifests/unattended_upgrades.pp | 2 +-
 manifests/upgrade_package.pp     | 2 --
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/manifests/apticron.pp b/manifests/apticron.pp
index 89709a8..73ada70 100644
--- a/manifests/apticron.pp
+++ b/manifests/apticron.pp
@@ -12,7 +12,9 @@ class apt::apticron(
   $customsubject = ''
 ) {
 
-  package { 'apticron': ensure => $ensure_version }
+  package { 'apticron':
+    ensure => $ensure_version
+  }
 
   file { '/etc/apticron/apticron.conf':
     content => template($apt::apticron::config),
diff --git a/manifests/cron/dist_upgrade.pp b/manifests/cron/dist_upgrade.pp
index e1a03ed..d3d3be3 100644
--- a/manifests/cron/dist_upgrade.pp
+++ b/manifests/cron/dist_upgrade.pp
@@ -2,7 +2,9 @@ class apt::cron::dist_upgrade (
   $cron_hours = '',
 ) {
 
-  package { 'cron-apt': ensure => installed }
+  package { 'cron-apt':
+    ensure => installed
+  }
 
   case $cron_hours {
     '': {}
@@ -27,7 +29,9 @@ dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-conf
     ensure => absent,
   }
 
-  package { 'apt-listbugs': ensure => absent }
+  package { 'apt-listbugs':
+    ensure => absent
+  }
 
   file { '/etc/cron-apt/action.d/4-dist-upgrade':
     content => $action,
diff --git a/manifests/dselect.pp b/manifests/dselect.pp
index 2b99a43..da00c96 100644
--- a/manifests/dselect.pp
+++ b/manifests/dselect.pp
@@ -7,5 +7,7 @@ class apt::dselect {
     line => 'expert',
   }
 
-  package { 'dselect': ensure => installed }
+  package { 'dselect':
+    ensure => installed
+  }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 3d93d22..30782e4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -74,7 +74,9 @@ class apt(
   include apt::dot_d_directories
 
   ## This package should really always be current
-  package { 'debian-archive-keyring': ensure => latest }
+  package { 'debian-archive-keyring':
+    ensure => latest
+  }
 
   if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
     apt::sources_list {
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index ecbbe6d..2c5641a 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -7,7 +7,9 @@ class apt::listchanges(
   $saveseen = '/var/lib/apt/listchanges.db',
   $which = 'both'
 ){
-  package { 'apt-listchanges': ensure => $ensure_version }
+  package { 'apt-listchanges':
+    ensure => $ensure_version
+  }
 
   file { '/etc/apt/listchanges.conf':
     content => template($apt::listchanges::config),
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index d604125..dff911d 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -8,7 +8,7 @@ class apt::unattended_upgrades (
 ) {
 
   package { 'unattended-upgrades':
-    ensure  => $ensure_version
+    ensure  => $ensure_version,
   }
 
   # For some reason, this directory is sometimes absent, which causes
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index e61b15d..73eb48b 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -13,14 +13,12 @@ define apt::upgrade_package (
   if !defined(Package['apt-show-versions']) {
     package { 'apt-show-versions':
       ensure  => installed,
-      require => undef,
     }
   }
 
   if !defined(Package['dctrl-tools']) {
     package { 'dctrl-tools':
       ensure  => installed,
-      require => undef,
     }
   }
 
-- 
cgit v1.2.3