From: Paul Wise <pabs@debian.org>
Date: Mon, 10 Nov 2014 02:16:49 +0000 (+0800)
Subject: Print less output when setting up one chroot fails and others succeed.
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a26ac69391c83a3f369bb6f7271d148f6be134ce;p=mirror%2Fdsa-puppet.git

Print less output when setting up one chroot fails and others succeed.
---

diff --git a/modules/porterbox/files/setup-all-dchroots b/modules/porterbox/files/setup-all-dchroots
index 3c39b48f1..0b4469b20 100755
--- a/modules/porterbox/files/setup-all-dchroots
+++ b/modules/porterbox/files/setup-all-dchroots
@@ -76,7 +76,7 @@ err=0
 
 for a in $archs; do
     for s in `get_suites "$a"`; do
-        if ! setup-dchroot -f -a "$a" "$s"; then
+        if ! chronic setup-dchroot -f -a "$a" "$s"; then
             err=1
             echo >&2
             echo >&2 "Error: setting up $s:$a dchroot failed."
diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 801798578..d1248310c 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -18,7 +18,7 @@ class porterbox {
 		source  => 'puppet:///modules/porterbox/setup-all-dchroots',
 	}
 	file { '/etc/cron.d/puppet-update-dchroots':
-		content  => "0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin chronic setup-all-dchroots\n",
+		content  => "0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots\n",
 	}
 	file { '/etc/cron.weekly/puppet-mail-big-homedirs':
 		mode    => '0555',