From 4204847fdd423dfaff0dafb5130080a30003921f Mon Sep 17 00:00:00 2001
From: nadir <nadir-technik@nadir.org>
Date: Thu, 8 Nov 2012 10:07:38 +0100
Subject: added $apt_disable_update to disable "apt-get update" during
 puppetruns

---
 manifests/dist_upgrade.pp    |  2 +-
 manifests/init.pp            |  5 +++++
 manifests/upgrade_package.pp | 13 ++++++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
index 9e26769..347ccc7 100644
--- a/manifests/dist_upgrade.pp
+++ b/manifests/dist_upgrade.pp
@@ -1,6 +1,6 @@
 class apt::dist_upgrade {
 
-  include apt::update
+  if $apt::disable_update = false { include apt::update }
 
   exec { 'apt_dist-upgrade':
     command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",
diff --git a/manifests/init.pp b/manifests/init.pp
index 2ae691f..794347f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -40,6 +40,11 @@ class apt {
     ''      => 'http://archive.ubuntu.com/ubuntu',
     default => "${apt_ubuntu_url}",
   }
+  $disable_update = $apt_disable_update ? {
+    ''      => false,
+    default => $apt_disable_update  
+  }
+
   case $operatingsystem {
     'debian': {
       $repos = $apt_repos ? {
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index 9202624..2ce6932 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -1,6 +1,8 @@
 define apt::upgrade_package ($version = "") {
 
-  include apt::update
+  if $apt::disable_update == false { 
+    include apt::update 
+  }
 
   $version_suffix = $version ? {
     ''       => '',
@@ -24,10 +26,11 @@ define apt::upgrade_package ($version = "") {
 
   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'],
-    ],
+    require => $apt::disable_update ? {
+      true    => Package['apt-show-versions', 'dctrl-tools'],
+      default => [ Exec['apt_updated'], 
+                 Package['apt-show-versions', 'dctrl-tools'] ],
+    } 
   }
 
 }
-- 
cgit v1.2.3


From 4718ae27c9e58e97baf520629ab154bc66acda6e Mon Sep 17 00:00:00 2001
From: nadir <nadir-technik@nadir.org>
Date: Thu, 8 Nov 2012 10:16:09 +0100
Subject: updated README to explain $apt_disable_update

---
 README | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README b/README
index be80c62..1d43284 100644
--- a/README
+++ b/README
@@ -155,6 +155,15 @@ $apt_repos
 If this variable is set the default repositories list ("main contrib non-free")
 is overriden.
 
+$apt_disable_update
+-------------------
+
+Disable "apt-get update" which is normally triggered by apt::upgrade_package 
+and apt::dist_upgrade. 
+Note that nodes can be updated once a day by using 
+  APT::Periodic::Update-Package-Lists "1";
+in i.e. /etc/apt/apt.conf.d/80_apt_update_daily.
+
 Classes
 =======
 
-- 
cgit v1.2.3


From 3a473dafd5887cb77b0b764dd951d9581b69f160 Mon Sep 17 00:00:00 2001
From: nadir <nadir-technik@nadir.org>
Date: Tue, 18 Dec 2012 22:31:00 +0100
Subject: comparing variabled should use double quotes (interestingly, it does
 work with only one too)

---
 manifests/dist_upgrade.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
index 347ccc7..47b1cff 100644
--- a/manifests/dist_upgrade.pp
+++ b/manifests/dist_upgrade.pp
@@ -1,6 +1,8 @@
 class apt::dist_upgrade {
 
-  if $apt::disable_update = false { include apt::update }
+  if $apt::disable_update == false {
+    include apt::update
+  }
 
   exec { 'apt_dist-upgrade':
     command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade",
-- 
cgit v1.2.3