From 5fdadb955d1a09b2b54cf9c746a9501b9400cd59 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sat, 18 Dec 2010 14:01:11 -0500
Subject: switch aptitude to apt-get, since aptitude will sometimes
 automatically do things that are unrelated to the task at hand, such as
 deinstalling automatically installed packages, which can be undesirable
 behavior

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

(limited to 'manifests')

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 358bd9e..ceb8ca3 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -22,7 +22,7 @@ define apt::upgrade_package ($version = "") {
     }
   }
 
-  exec { "aptitude -y install ${name}${version_suffix}":
+  exec { "apt-get --force-yes -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'],
-- 
cgit v1.2.3


From c5dc8ff5fc7762fc81871f71bed54daaee1f8707 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sat, 18 Dec 2010 15:47:11 -0500
Subject: add -q to the apt-get invocation in upgrade_package.pp, also switch
 to using -y instead of --force-yes. this way we are acting in the same way as
 the dist_upgrade class

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

(limited to 'manifests')

diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index ceb8ca3..9202624 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -22,7 +22,7 @@ define apt::upgrade_package ($version = "") {
     }
   }
 
-  exec { "apt-get --force-yes -o DPkg::Options::=--force-confold install ${name}${version_suffix}":
+  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'],
-- 
cgit v1.2.3


From d76f922dfb1120c013da1b2c1904aac2d580e342 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 8 Jan 2011 19:39:10 +0100
Subject: Make sources snippets world-readable.

Not doing this breaks big parts of functionality, such as aptitude why.
---
 manifests/sources_list.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp
index ff8f21a..86b35a7 100644
--- a/manifests/sources_list.pp
+++ b/manifests/sources_list.pp
@@ -13,7 +13,7 @@ define apt::sources_list (
 
   file { "/etc/apt/sources.list.d/${name}":
     ensure => $ensure,
-    owner => root, group => 0, mode => 0600;
+    owner => root, group => 0, mode => 0644;
   }
 
   if $source {
-- 
cgit v1.2.3