Merge branch 'master' of git://labs.riseup.net/shared-apt

Conflicts:
	manifests/init.pp
	templates/sources.list.backports.erb

1 files changed, 33 insertions, 0 deletions

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
new file mode 100644
index 0000000..9202624
--- /dev/null
+++ b/manifests/upgrade_package.pp
@@ -0,0 +1,33 @@
+define apt::upgrade_package ($version = "") {
+
+  include apt::update
+
+  $version_suffix = $version ? {
+    ''       => '',
+    'latest' => '',
+    default  => "=${version}",
+  }
+
+  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,
+    }
+  }
+
+  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 => [
+      Exec['apt_updated'],
+      Package['apt-show-versions', 'dctrl-tools'],
+    ],
+  }
+
+}