X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=efe91dbca428e5c5cbf2bea6eedc31054092ba51;hb=f5332ef84deb1a27990c625d2eb0901746cf3499;hp=ad592d77771b6887e2ad9c6faf8baaf31f67eb9a;hpb=464c4699d7cc18c39018bffbd32687fe312251a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ad592d777..efe91dbca 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -20,11 +20,9 @@ class debian-org {
 			'dsa-munin-plugins',
 		]:
 		ensure => installed,
-		require => [
-			File['/etc/apt/sources.list.d/db.debian.org.list'],
-			Exec['apt-get update']
-		]
+		tag    => extra_repo,
 	}
+
 	package { [
 			'apt-utils',
 			'bash-completion',
@@ -40,7 +38,7 @@ class debian-org {
 	}
 
 	if $::lsbmajdistrelease >= 7 {
-		package { 'libfilesystem-ruby1.9':
+		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
 	}
@@ -68,10 +66,7 @@ class debian-org {
 	if getfromhash($site::nodeinfo, 'broken-rtc') {
 		package { 'fake-hwclock':
 			ensure => installed,
-			require => [
-				File['/etc/apt/sources.list.d/db.debian.org.list'],
-				Exec['apt-get update']
-			]
+			tag    => extra_repo,
 		}
 	}
 
@@ -236,6 +231,7 @@ class debian-org {
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true,
 	}
+	Exec['apt-get update']->Package<| tag == extra_repo |>
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',