From 7abe65323c6bf5909c19fa7766af23048559c79d Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Fri, 27 Apr 2012 20:20:12 +0100
Subject: [PATCH] Revert "try to order these a bit"

This reverts commit 382b96856d6c214d79ae17d7f3b919ed7ae99bf8.
---
 manifests/site.pp                    |  3 +--
 modules/buildd/manifests/init.pp     |  7 ++-----
 modules/debian-org/manifests/init.pp |  1 -
 modules/site/manifests/aptrepo.pp    | 21 +++++++++------------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9c714a5c3..3aa599098 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,5 @@
 Package {
-	require => File['/etc/apt/apt.conf.d/local-recommends'],
-	stage   => deploy_infra
+	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 6bd381e10..1de4f3377 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -7,16 +7,13 @@ class buildd {
 		package { 'schroot': ensure => held }
 	}
 
-	package { 'apt-transport-https':
-		ensure => installed,
-		stage  => setup,
-	}
 	package { [
 			'sbuild',
+			'apt-transport-https',
 			'debootstrap',
 			'dupload'
 		]:
-		ensure => installed
+			ensure => installed
 	}
 
 	site::linux_module { 'dm_snapshot': }
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index c3488e503..912cfd616 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -179,7 +179,6 @@ class debian-org {
 
 	exec { 'apt-get update':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		stage       => setup_infra,
 		refreshonly => true,
 	}
 
diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index b71c5fa25..d0e34ecaf 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,18 +1,17 @@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present, $require = []) {
+
 
 	case $ensure {
 		present: {
 			if $key {
 				exec { "apt-key-update-${name}":
 					command     => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
-					stage       => setup,
 					refreshonly => true,
 				}
 
 				file { "/etc/apt/trusted-keys.d/${name}.asc":
 					source => $key,
 					mode   => '0664',
-					stage  => setup,
 					notify => Exec["apt-key-update-${name}"]
 				}
 			}
@@ -21,23 +20,19 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
 			if ($keyid) and ($key) {
 				file { "/etc/apt/trusted-keys.d/${name}.asc":
 					ensure => absent,
-					stage  => setup,
 					notify => Exec["apt-key-del-${keyid}"]
 				}
 				exec { "apt-key-del-${keyid}":
 					command     => "apt-key del ${keyid}",
-					stage       => setup,
 					refreshonly => true,
 				}
 			} elsif $key {
 				file { "/etc/apt/trusted-keys.d/${name}.asc":
 					ensure => absent,
-					stage  => setup,
 				}
 			} elsif $keyid {
 				exec { "apt-key-del-${keyid}":
-					command => "apt-key del ${keyid}",
-					stage   => setup,
+					command     => "apt-key del ${keyid}",
 				}
 			}
 		}
@@ -54,13 +49,15 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
 		file { "/etc/apt/sources.list.d/${name}.list":
 			ensure  => $ensure,
 			content => template($template),
-			notify  => Exec['apt-get update'],
+			notify => Exec['apt-get update'],
+			require => $require,
 		}
 	} else {
 		file { "/etc/apt/sources.list.d/${name}.list":
-			ensure  => $ensure,
-			source  => $config,
-			notify  => Exec['apt-get update'],
+			ensure => $ensure,
+			source => $config,
+			notify => Exec['apt-get update'],
+			require => $require,
 		}
 	}
 }
-- 
2.20.1