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/upgrade_package.pp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'manifests/upgrade_package.pp')

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


From ef6036e879f894697a03459501a994af930dc4f6 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:37:05 -0500
Subject: harmonize variable alignment

---
 manifests/upgrade_package.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/upgrade_package.pp')

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 73eb48b..54dbff6 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -1,7 +1,7 @@
 # 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 (
-  $version = ''
+  $version = '',
 ) {
 
   $version_suffix = $version ? {
-- 
cgit v1.2.3


From c4e6f42e1b629e98ddeeb7c9821f1266f7295685 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:46:37 -0500
Subject: fix missing/superfluous newline at the end/beginning of files

---
 manifests/upgrade_package.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/upgrade_package.pp')

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 54dbff6..f739f07 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -1,5 +1,6 @@
 # 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 (
   $version = '',
 ) {
@@ -27,5 +28,4 @@ define apt::upgrade_package (
     require => Package['apt-show-versions', 'dctrl-tools'],
     before  => Exec['apt_updated']
   }
-
 }
-- 
cgit v1.2.3


From bdd6cf421143914cc2c0c63fa543013892fd3bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= <pollito@riseup.net>
Date: Thu, 22 Dec 2016 22:17:35 -0500
Subject: use the same name for the update_apt exec everywhere

---
 manifests/upgrade_package.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/upgrade_package.pp')

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index f739f07..a96db7c 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -26,6 +26,6 @@ define apt::upgrade_package (
   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" ],
     require => Package['apt-show-versions', 'dctrl-tools'],
-    before  => Exec['apt_updated']
+    before  => Exec['update_apt']
   }
 }
-- 
cgit v1.2.3


From fd8b21222b969e779d10cb5d49e2e10f717b8358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= <pollito@riseup.net>
Date: Thu, 22 Dec 2016 22:26:43 -0500
Subject: make sure every object ends with either a comma or a semicolon

---
 manifests/upgrade_package.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/upgrade_package.pp')

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index a96db7c..079fc3b 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -26,6 +26,6 @@ define apt::upgrade_package (
   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" ],
     require => Package['apt-show-versions', 'dctrl-tools'],
-    before  => Exec['update_apt']
+    before  => Exec['update_apt'];
   }
 }
-- 
cgit v1.2.3


From 2cf97fbf458522e9da6a3ed21e3105d1f488d111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= <pollito@riseup.net>
Date: Thu, 22 Dec 2016 22:41:20 -0500
Subject: mark packages as present instead of installed to be consistent

---
 manifests/upgrade_package.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/upgrade_package.pp')

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 079fc3b..3ba2077 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -13,13 +13,13 @@ define apt::upgrade_package (
 
   if !defined(Package['apt-show-versions']) {
     package { 'apt-show-versions':
-      ensure  => installed,
+      ensure  => present,
     }
   }
 
   if !defined(Package['dctrl-tools']) {
     package { 'dctrl-tools':
-      ensure  => installed,
+      ensure  => present,
     }
   }
 
-- 
cgit v1.2.3